diff --git a/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt b/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt
index cb253bfe1..1c915f57d 100644
--- a/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt
@@ -6,21 +6,15 @@ package org.mozilla.fenix.components.metrics
 
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import mozilla.components.lib.crash.Crash
 import mozilla.components.lib.crash.CrashReporter
 import mozilla.components.lib.crash.service.CrashReporterService
 import mozilla.components.support.test.any
 import mozilla.components.support.test.mock
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.spy
 import org.mockito.Mockito.verify
-import org.mozilla.fenix.TestApplication
-import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-@Config(application = TestApplication::class)
 internal class BreadcrumbRecorderTest {
     @Test
     fun `ensure crash reporter recordCrashBreadcrumb is called`() {
diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchInteractorTest.kt
index 58750be3b..bf70de493 100644
--- a/app/src/test/java/org/mozilla/fenix/search/SearchInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/search/SearchInteractorTest.kt
@@ -8,39 +8,28 @@ import android.content.Context
 import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.navigation.NavController
 import androidx.navigation.NavDirections
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.mockk.Runs
 import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
-import io.mockk.mockkObject
 import io.mockk.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
 import mozilla.components.browser.search.SearchEngine
 import mozilla.components.browser.search.SearchEngineManager
 import mozilla.components.browser.session.Session
-import mozilla.components.support.test.robolectric.testContext
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.FenixApplication
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
-import org.mozilla.fenix.TestApplication
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.searchengine.CustomSearchEngineStore.PREF_FILE_SEARCH_ENGINES
 import org.mozilla.fenix.ext.metrics
 import org.mozilla.fenix.ext.navigateSafe
 import org.mozilla.fenix.ext.searchEngineManager
-import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.utils.Settings
-import org.mozilla.fenix.whatsnew.clear
-import org.robolectric.annotation.Config
 
 @ExperimentalCoroutinesApi
-@RunWith(AndroidJUnit4::class)
-@Config(application = TestApplication::class)
 class SearchInteractorTest {
 
     private val lifecycleScope: LifecycleCoroutineScope = mockk(relaxed = true)
@@ -121,10 +110,6 @@ class SearchInteractorTest {
     fun onTextChanged() {
         val store: SearchFragmentStore = mockk(relaxed = true)
         val context: HomeActivity = mockk(relaxed = true)
-        val settings = testContext.settings().apply { testContext.settings().clear() }
-
-        mockkObject(Settings)
-        every { Settings.getInstance(context = context) } returns settings
 
         every { store.state } returns mockk(relaxed = true)
 
diff --git a/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt
index b15ce2a4f..44c8a4862 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt
@@ -5,7 +5,6 @@
 package org.mozilla.fenix.settings.deletebrowsingdata
 
 import android.content.Context
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.mockk.Runs
 import io.mockk.every
 import io.mockk.just
@@ -21,14 +20,9 @@ import mozilla.components.concept.engine.Engine
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.mozilla.fenix.TestApplication
 import org.mozilla.fenix.ext.components
-import org.robolectric.annotation.Config
 
 @ExperimentalCoroutinesApi
-@RunWith(AndroidJUnit4::class)
-@Config(application = TestApplication::class)
 class DefaultDeleteBrowsingDataControllerTest {
 
     private val mainThreadSurrogate = newSingleThreadContext("UI thread")
diff --git a/app/src/test/java/org/mozilla/fenix/utils/FragmentPreDrawManagerTest.kt b/app/src/test/java/org/mozilla/fenix/utils/FragmentPreDrawManagerTest.kt
index 557a8cb63..2515bfe4d 100644
--- a/app/src/test/java/org/mozilla/fenix/utils/FragmentPreDrawManagerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/utils/FragmentPreDrawManagerTest.kt
@@ -6,21 +6,15 @@ package org.mozilla.fenix.utils
 
 import androidx.core.view.OneShotPreDrawListener
 import androidx.fragment.app.Fragment
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.mozilla.fenix.TestApplication
-import org.robolectric.annotation.Config
 
 @ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
-@RunWith(AndroidJUnit4::class)
-@Config(application = TestApplication::class)
 class FragmentPreDrawManagerTest {
     private fun doNothing() { /*noop*/ }
 
diff --git a/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewVersionTest.kt b/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewVersionTest.kt
index 39f594129..2c0de9467 100644
--- a/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewVersionTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewVersionTest.kt
@@ -4,15 +4,9 @@ package org.mozilla.fenix.whatsnew
  * 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/. */
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.mozilla.fenix.TestApplication
-import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-@Config(application = TestApplication::class)
 class WhatsNewVersionTest {
     @Test
     fun testMajorVersionNumber() {