diff --git a/test/editor/caret-test.js b/test/editor/caret-test.js
index e1a66a4431..33b40e1c64 100644
--- a/test/editor/caret-test.js
+++ b/test/editor/caret-test.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import "../skinned-sdk"; // Must be first for skinning to work
 import { getLineAndNodePosition } from "../../src/editor/caret";
 import EditorModel from "../../src/editor/model";
 import { createPartCreator } from "./mock";
diff --git a/test/editor/model-test.js b/test/editor/model-test.js
index 35bd4143a7..15c5af5806 100644
--- a/test/editor/model-test.js
+++ b/test/editor/model-test.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import "../skinned-sdk"; // Must be first for skinning to work
 import EditorModel from "../../src/editor/model";
 import { createPartCreator, createRenderer } from "./mock";
 
diff --git a/test/editor/operations-test.js b/test/editor/operations-test.js
index 32ccaa5440..17a4c8ba11 100644
--- a/test/editor/operations-test.js
+++ b/test/editor/operations-test.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import "../skinned-sdk"; // Must be first for skinning to work
 import EditorModel from "../../src/editor/model";
 import { createPartCreator, createRenderer } from "./mock";
 import { toggleInlineFormat } from "../../src/editor/operations";
diff --git a/test/editor/position-test.js b/test/editor/position-test.js
index 813a8e9f7f..ea8658b216 100644
--- a/test/editor/position-test.js
+++ b/test/editor/position-test.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import "../skinned-sdk"; // Must be first for skinning to work
 import EditorModel from "../../src/editor/model";
 import { createPartCreator } from "./mock";
 
diff --git a/test/editor/range-test.js b/test/editor/range-test.js
index d411a0d911..87c5b06e44 100644
--- a/test/editor/range-test.js
+++ b/test/editor/range-test.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import "../skinned-sdk"; // Must be first for skinning to work
 import EditorModel from "../../src/editor/model";
 import { createPartCreator, createRenderer } from "./mock";
 
diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
index 691130bd34..085a8afdba 100644
--- a/test/editor/serialize-test.js
+++ b/test/editor/serialize-test.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import "../skinned-sdk"; // Must be first for skinning to work
 import EditorModel from "../../src/editor/model";
 import { htmlSerializeIfNeeded } from "../../src/editor/serialize";
 import { createPartCreator } from "./mock";
diff --git a/test/stores/SpaceStore-setup.ts b/test/stores/SpaceStore-setup.ts
new file mode 100644
index 0000000000..67d492255f
--- /dev/null
+++ b/test/stores/SpaceStore-setup.ts
@@ -0,0 +1,23 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+// This needs to be executed before the SpaceStore gets imported but due to ES6 import hoisting we have to do this here.
+// SpaceStore reads the SettingsStore which needs the localStorage values set at init time.
+
+localStorage.setItem("mx_labs_feature_feature_spaces", "true");
+localStorage.setItem("mx_labs_feature_feature_spaces.all_rooms", "true");
+localStorage.setItem("mx_labs_feature_feature_spaces.space_member_dms", "true");
+localStorage.setItem("mx_labs_feature_feature_spaces.space_dm_badges", "false");
diff --git a/test/stores/SpaceStore-test.ts b/test/stores/SpaceStore-test.ts
index 4cbd9f43c8..eb28a72d67 100644
--- a/test/stores/SpaceStore-test.ts
+++ b/test/stores/SpaceStore-test.ts
@@ -16,7 +16,9 @@ limitations under the License.
 
 import { EventEmitter } from "events";
 import { EventType } from "matrix-js-sdk/src/@types/event";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
+import "./SpaceStore-setup"; // enable space lab
 import "../skinned-sdk"; // Must be first for skinning to work
 import SpaceStore, {
     UPDATE_INVITED_SPACES,
@@ -26,13 +28,10 @@ import SpaceStore, {
 import { resetAsyncStoreWithClient, setupAsyncStoreWithClient } from "../utils/test-utils";
 import { mkEvent, mkStubRoom, stubClient } from "../test-utils";
 import { EnhancedMap } from "../../src/utils/maps";
-import SettingsStore from "../../src/settings/SettingsStore";
 import DMRoomMap from "../../src/utils/DMRoomMap";
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 import defaultDispatcher from "../../src/dispatcher/dispatcher";
 
-type MatrixEvent = any; // importing from js-sdk upsets things
-
 jest.useFakeTimers();
 
 const mockStateEventImplementation = (events: MatrixEvent[]) => {
@@ -79,9 +78,6 @@ const mkSpace = (spaceId: string, children: string[] = []) => {
     return space;
 };
 
-const getValue = jest.fn();
-SettingsStore.getValue = getValue;
-
 const getUserIdForRoomId = jest.fn();
 // @ts-ignore
 DMRoomMap.sharedInstance = { getUserIdForRoomId };
@@ -122,18 +118,6 @@ describe("SpaceStore", () => {
     beforeEach(() => {
         jest.runAllTimers();
         client.getVisibleRooms.mockReturnValue(rooms = []);
-        getValue.mockImplementation(settingName => {
-            switch (settingName) {
-                case "feature_spaces":
-                    return true;
-                case "feature_spaces.all_rooms":
-                    return true;
-                case "feature_spaces.space_member_dms":
-                    return true;
-                case "feature_spaces.space_dm_badges":
-                    return false;
-            }
-        });
     });
     afterEach(async () => {
         await resetAsyncStoreWithClient(store);