diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index ce7ef541c9..24a4ceed3c 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -163,6 +163,13 @@ describe('joining a room', function () {
             }).then(() => {
                 // wait for the join request to be made
                 return q.delay(1);
+            }).then(() => {
+                // and again, because the state update has to go to the store and
+                // then one dispatch within the store, then to the view
+                // XXX: This is *super flaky*: a better way would be to declare
+                // that we expect a certain state transition to happen, then wait
+                // for that transition to occur.
+                return q.delay(1);
             }).then(() => {
                 // the roomview should now be loading
                 expect(roomView.state.room).toBe(null);
@@ -177,6 +184,8 @@ describe('joining a room', function () {
             }).then(() => {
                 httpBackend.verifyNoOutstandingExpectation();
 
+                return q.delay(1);
+            }).then(() => {
                 // We've joined, expect this to false
                 expect(roomView.state.joining).toBe(false);
 
diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index 281e1bb791..b6e4324f27 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -192,13 +192,15 @@ describe('loading:', function () {
                 }).respond(403, "Guest access is disabled");
 
                 return httpBackend.flush();
+            }).then(() => {
+                // Wait for another trip around the event loop for the UI to update
+                return q.delay(1);
             }).then(() => {
                 // we expect a single <Login> component following session load
                 ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, sdk.getComponent('structures.login.Login'));
                 expect(windowLocation.hash).toEqual("");
-                done();
-            });
+            }).done(done, done);
         });
 
         it('should follow the original link after successful login', function(done) {