diff --git a/app/templates/e2e/account(auth)/login/login.spec(jasmine).js b/app/templates/e2e/account(auth)/login/login.spec(jasmine).js
index 6a65fc7cb..c44eb75cd 100644
--- a/app/templates/e2e/account(auth)/login/login.spec(jasmine).js
+++ b/app/templates/e2e/account(auth)/login/login.spec(jasmine).js
@@ -26,7 +26,14 @@ describe('Login View', function() {
            if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
       })
       .then(loadPage)
-      .finally(done);
+      .finally(function() {
+        browser.wait(function() {
+          //console.log('waiting for angular...');
+          return browser.executeScript('return !!window.angular');
+
+        }, 5000).then(done);
+
+      });
   });
 
   it('should include login form with correct inputs and submit button', function() {
diff --git a/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js b/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js
index 37c5e375a..e5edfb385 100644
--- a/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js
+++ b/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js
@@ -26,7 +26,11 @@ describe('Logout View', function() {
       .then(function() {
         return login(testUser);
       })
-      .finally(done);
+      .finally(function() {
+        browser.wait(function() {
+            return browser.executeScript('return !!window.angular');
+        }, 5000).then(done);
+      });
   });
 
   describe('with local auth', function() {
diff --git a/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js b/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js
index 903c89817..a97f15b5b 100644
--- a/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js
+++ b/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js
@@ -20,8 +20,11 @@ describe('Signup View', function() {
     confirmPassword: 'test'
   };
 
-  beforeEach(function() {
+  beforeEach(function(done) {
     loadPage();
+    browser.wait(function() {
+        return browser.executeScript('return !!window.angular');
+    }, 5000).then(done);
   });
 
   it('should include signup form with correct inputs and submit button', function() {