diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index a323a26269..ed1875e004 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -29,6 +29,7 @@ import jssdk from 'matrix-js-sdk';
 import sdk from 'matrix-react-sdk';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
+import {VIEWS} from 'matrix-react-sdk/lib/components/structures/MatrixChat';
 
 import * as test_utils from '../test-utils';
 import MockHttpBackend from '../mock-request';
@@ -153,8 +154,8 @@ describe('loading:', function () {
             .check((r) => {syncRequest = r;})
             .respond(200, response);
 
-        console.log("waiting for /sync");
         for (let attempts = 10; attempts > 0; attempts--) {
+            console.log(Date.now() + " waiting for /sync");
             if (syncRequest) {
                 return syncRequest;
             }
@@ -184,7 +185,7 @@ describe('loading:', function () {
                 // we expect a single <Login> component following session load
                 ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, sdk.getComponent('structures.login.Login'));
-                expect(windowLocation.hash).toEqual("");
+                expect(windowLocation.hash).toEqual("#/login");
             }).done(done, done);
         });
 
@@ -360,6 +361,9 @@ describe('loading:', function () {
                 loadApp({
                     uriFragment: "#/login",
                 });
+
+                // give the UI a chance to display
+                return q.delay(50);
             });
 
             it('shows a login view', function() {
@@ -589,7 +593,8 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
         retryCount = 0;
     }
 
-    if (matrixChat.state.loading || matrixChat.state.loggingIn) {
+    if (matrixChat.state.view === VIEWS.LOADING ||
+            matrixChat.state.view === VIEWS.LOGGING_IN) {
         console.log(Date.now() + " Awaiting sync spinner: still loading.");
         if (retryCount >= retryLimit) {
             throw new Error("MatrixChat still not loaded after " +
@@ -628,8 +633,7 @@ function awaitRoomView(matrixChat, retryLimit, retryCount) {
         retryCount = 0;
     }
 
-    if (matrixChat.state.loading ||
-        !(matrixChat.state.loggedIn && matrixChat.state.ready)) {
+    if (matrixChat.state.view !== VIEWS.LOGGED_IN || !matrixChat.state.ready) {
         console.log(Date.now() + " Awaiting room view: not ready yet.");
         if (retryCount >= retryLimit) {
             throw new Error("MatrixChat still not ready after " +