diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
new file mode 100644
index 0000000000..a10201d465
--- /dev/null
+++ b/test/components/structures/auth/Registration-test.js
@@ -0,0 +1,83 @@
+/*
+Copyright 2019 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import expect from 'expect';
+import sinon from 'sinon';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import ReactTestUtils from 'react-dom/test-utils';
+import sdk from 'matrix-react-sdk';
+import SdkConfig from '../../../../src/SdkConfig';
+import * as TestUtils from '../../../test-utils';
+
+const Registration = sdk.getComponent(
+    'structures.auth.Registration',
+);
+
+describe('Registration', function() {
+    let parentDiv;
+
+    beforeEach(function() {
+        TestUtils.beforeEach(this);
+        parentDiv = document.createElement('div');
+        document.body.appendChild(parentDiv);
+    });
+
+    afterEach(function() {
+        sinon.restore();
+        ReactDOM.unmountComponentAtNode(parentDiv);
+        parentDiv.remove();
+    });
+
+    function render() {
+        return ReactDOM.render(<Registration
+            defaultHsUrl="https://matrix.org"
+            defaultIsUrl="https://vector.im"
+            makeRegistrationUrl={() => {}}
+            onLoggedIn={() => {}}
+            onLoginClick={() => {}}
+            onServerConfigChange={() => {}}
+        />, parentDiv);
+    }
+
+    it('should show server type selector', function() {
+        const root = render();
+        const selector = ReactTestUtils.findRenderedComponentWithType(
+            root,
+            sdk.getComponent('auth.ServerTypeSelector'),
+        );
+        expect(selector).toBeTruthy();
+    });
+
+    it('should show form when custom URLs disabled', function() {
+        sinon.stub(SdkConfig, "get").returns({
+            disable_custom_urls: true,
+        });
+
+        const root = render();
+
+        // Set non-empty flows to get past the loading spinner
+        root.setState({
+            flows: [],
+        });
+
+        const form = ReactTestUtils.findRenderedComponentWithType(
+            root,
+            sdk.getComponent('auth.RegistrationForm'),
+        );
+        expect(form).toBeTruthy();
+    });
+});