diff --git a/e2e/pages/login-page.ts b/e2e/pages/login-page.ts
index 95cc0bc19..b4c1dbfb0 100644
--- a/e2e/pages/login-page.ts
+++ b/e2e/pages/login-page.ts
@@ -47,12 +47,10 @@ export class LoginPage extends Page {
         });
     }
 
-    loginWith(username: string, password?: string): promise.Promise<void> {
+    loginWith(username: string, password?: string): promise.Promise<any> {
         const pass = password || username;
         return this.login.enterCredentials(username, pass).submit()
-            .then(() => {
-                super.waitForApp();
-            });
+            .then(() => super.waitForApp());
     }
 
     loginWithAdmin(): promise.Promise<any> {
diff --git a/e2e/suites/list-views/empty-list.test.ts b/e2e/suites/list-views/empty-list.test.ts
index f344e0662..223c8588e 100644
--- a/e2e/suites/list-views/empty-list.test.ts
+++ b/e2e/suites/list-views/empty-list.test.ts
@@ -22,7 +22,7 @@ import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
 import { Utils } from '../../utilities/utils';
 import { RepoClient, NodeContentTree } from '../../utilities/repo-client/repo-client';
 
-fdescribe('Empty list views', () => {
+describe('Empty list views', () => {
     const username = `user-${Utils.random()}`;
     const password = username;
 
@@ -38,9 +38,13 @@ fdescribe('Empty list views', () => {
 
     beforeAll(done => {
         apis.admin.people.createUser(username)
-            .then(() => loginPage.load()
-                .then(() => loginPage.loginWith(username))
-                .then(done));
+            .then(() => loginPage.load())
+            .then(() => loginPage.loginWith(username))
+            .then(done);
+    });
+
+    afterAll(done => {
+        logoutPage.load().then(done);
     });
 
     it('empty Personal Files', () => {