diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 51a97737c..b11a4c32f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -53,7 +53,6 @@
 
 # Possible startup regressions
 *Application.kt @mozilla-mobile/Performance
-*StrictMode*kt @mozilla-mobile/Performance
 
 # We want to be aware of new features behind flags as well as features
 # about to be enabled.
diff --git a/app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt b/app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt
index 37ac4e8d6..444bc7f73 100644
--- a/app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt
@@ -18,7 +18,7 @@ import org.junit.Assert.fail
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.perf.StrictModeManager
-import org.mozilla.fenix.helpers.TestStrictModeManager
+import org.mozilla.fenix.helpers.perf.TestStrictModeManager
 import kotlin.coroutines.CoroutineContext
 
 @RunWith(FenixRobolectricTestRunner::class)
diff --git a/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt b/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt
index a37c30071..511a24e81 100644
--- a/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt
@@ -6,7 +6,7 @@ package org.mozilla.fenix.components
 
 import android.content.Context
 import io.mockk.mockk
-import org.mozilla.fenix.helpers.TestStrictModeManager
+import org.mozilla.fenix.helpers.perf.TestStrictModeManager
 import org.mozilla.fenix.utils.ClipboardHandler
 import org.mozilla.fenix.utils.Settings
 
diff --git a/app/src/test/java/org/mozilla/fenix/helpers/TestStrictModeManager.kt b/app/src/test/java/org/mozilla/fenix/helpers/perf/TestStrictModeManager.kt
similarity index 95%
rename from app/src/test/java/org/mozilla/fenix/helpers/TestStrictModeManager.kt
rename to app/src/test/java/org/mozilla/fenix/helpers/perf/TestStrictModeManager.kt
index b846d10ee..b2a3aada7 100644
--- a/app/src/test/java/org/mozilla/fenix/helpers/TestStrictModeManager.kt
+++ b/app/src/test/java/org/mozilla/fenix/helpers/perf/TestStrictModeManager.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.helpers
+package org.mozilla.fenix.helpers.perf
 
 import android.os.StrictMode
 import io.mockk.mockk