diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
index e09304962f66..422d76456eec 100644
--- a/test/components/structures/auth/Registration-test.js
+++ b/test/components/structures/auth/Registration-test.js
@@ -14,12 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import sdk from '../../../skinned-sdk';
+
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
-import sdk from '../../../skinned-sdk';
+import { createClient } from 'matrix-js-sdk/src/matrix';
+
 import SdkConfig from '../../../../src/SdkConfig';
-import { mkServerConfig } from "../../../test-utils";
+import { createTestClient, mkServerConfig } from "../../../test-utils";
+
+jest.mock('matrix-js-sdk/src/matrix');
+jest.useFakeTimers();
 
 const Registration = sdk.getComponent(
     'structures.auth.Registration',
@@ -31,6 +37,7 @@ describe('Registration', function() {
     beforeEach(function() {
         parentDiv = document.createElement('div');
         document.body.appendChild(parentDiv);
+        createClient.mockImplementation(() => createTestClient());
     });
 
     afterEach(function() {
@@ -48,13 +55,13 @@ describe('Registration', function() {
         />, parentDiv);
     }
 
-    it('should show server picker', function() {
+    it('should show server picker', async function() {
         const root = render();
         const selector = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_ServerPicker");
         expect(selector).toBeTruthy();
     });
 
-    it('should show form when custom URLs disabled', function() {
+    it('should show form when custom URLs disabled', async function() {
         jest.spyOn(SdkConfig, "get").mockReturnValue({
             disable_custom_urls: true,
         });
@@ -77,7 +84,7 @@ describe('Registration', function() {
         expect(form).toBeTruthy();
     });
 
-    it("should show SSO options if those are available", () => {
+    it("should show SSO options if those are available", async () => {
         jest.spyOn(SdkConfig, "get").mockReturnValue({
             disable_custom_urls: true,
         });