diff --git a/BrowserKit/Package.swift b/BrowserKit/Package.swift
index cf3baa3642625..31c3fc124c216 100644
--- a/BrowserKit/Package.swift
+++ b/BrowserKit/Package.swift
@@ -136,7 +136,11 @@ let package = Package(
                             .enableExperimentalFeature("StrictConcurrency")]),
         .testTarget(
             name: "TabDataStoreTests",
-            dependencies: ["TabDataStore"]),
+            dependencies: ["TabDataStore"],
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency"),
+            ]
+        ),
         .target(
             name: "Redux",
             dependencies: ["Common"],
diff --git a/BrowserKit/Tests/TabDataStoreTests/XCTestCaseExtension.swift b/BrowserKit/Tests/TabDataStoreTests/XCTestCaseExtension.swift
index f08f33aef0149..66e87fcd81cf4 100644
--- a/BrowserKit/Tests/TabDataStoreTests/XCTestCaseExtension.swift
+++ b/BrowserKit/Tests/TabDataStoreTests/XCTestCaseExtension.swift
@@ -6,6 +6,7 @@ import Foundation
 import XCTest
 
 extension XCTestCase {
+    // TODO: Needs group discussion on solution for warnings
     func trackForMemoryLeaks(_ instance: AnyObject, file: StaticString = #filePath, line: UInt = #line) {
         addTeardownBlock { [weak instance] in
             XCTAssertNil(