diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js
index e79cf037d0..6a7982dd47 100644
--- a/test/components/structures/auth/Login-test.js
+++ b/test/components/structures/auth/Login-test.js
@@ -55,6 +55,11 @@ describe('Login', function() {
     it('should show form with change server link', function() {
         const root = render();
 
+        // Set non-empty flows & matrixClient to get past the loading spinner
+        root.setState({
+            currentFlow: "m.login.password",
+        });
+
         const form = ReactTestUtils.findRenderedComponentWithType(
             root,
             sdk.getComponent('auth.PasswordLogin'),