1 files changed, 3 insertions, 3 deletions

diff --git a/client/e2e/src/suites-local/signup.e2e-spec.ts b/client/e2e/src/suites-local/signup.e2e-spec.ts
index 7c822a6e6..ad0cc218e 100644
--- a/client/e2e/src/suites-local/signup.e2e-spec.ts
+++ b/client/e2e/src/suites-local/signup.e2e-spec.ts
@@ -244,9 +244,9 @@ describe('Signup', () => {
 
     before(async () => {
       // FIXME: typings are wrong, get returns a promise
-      emailPort = await browser.sharedStore.get('emailPort') as unknown as number
+      emailPort = await (browser.sharedStore.get(browser.config.baseUrl + '-emailPort') as unknown as Promise<number>)
 
-      MockSMTPServer.Instance.collectEmails(emailPort, emails)
+      await MockSMTPServer.Instance.collectEmails(emailPort, emails)
     })
 
     describe('Direct registration', function () {
@@ -404,7 +404,7 @@ describe('Signup', () => {
       })
     })
 
-    before(() => {
+    after(() => {
       MockSMTPServer.Instance.kill()
     })
   })