diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/FilteredDeckOptionsTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/FilteredDeckOptionsTest.kt
index ebdeb14cab85..c7c9feddedbc 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/FilteredDeckOptionsTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/FilteredDeckOptionsTest.kt
@@ -36,9 +36,11 @@ class FilteredDeckOptionsTest : InstrumentedTest() {
 
     @Test
     fun canOpenDeckOptions() {
-        ActivityScenario.launch(DeckPicker::class.java).onActivity { deckPicker ->
-            val deckId = col.decks.newFiltered("Filtered Testing")
-            deckPicker.showContextMenuDeckOptions(deckId)
-        }.close()
+        ActivityScenario.launch(DeckPicker::class.java).use { scenario ->
+            scenario.onActivity { deckPicker ->
+                val deckId = col.decks.newFiltered("Filtered Testing")
+                deckPicker.showContextMenuDeckOptions(deckId)
+            }
+        }
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
index 51aff6a8c8a5..70870356897b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
@@ -622,9 +622,10 @@ class TagsDialogTest : RobolectricTest() {
             .arguments
         val mockListener = Mockito.mock(TagsDialogListener::class.java)
         val factory = TagsDialogFactory(mockListener)
-        val scenario = FragmentScenario.launch(TagsDialog::class.java, args, R.style.Theme_Light, factory)
-        scenario.moveToState(Lifecycle.State.STARTED)
-        scenario.onFragment { Timber.d("Dialog successfully opened") }
+        FragmentScenario.launch(TagsDialog::class.java, args, R.style.Theme_Light, factory).use { scenario ->
+            scenario.moveToState(Lifecycle.State.STARTED)
+            scenario.onFragment { Timber.d("Dialog successfully opened") }
+        }
     }
 
     @Test
@@ -637,20 +638,21 @@ class TagsDialogTest : RobolectricTest() {
             .arguments
         val mockListener = Mockito.mock(TagsDialogListener::class.java)
         val factory = TagsDialogFactory(mockListener)
-        val scenario = FragmentScenario.launch(TagsDialog::class.java, args, R.style.Theme_Light, factory)
-        scenario.moveToState(Lifecycle.State.STARTED)
-        scenario.onFragment { f ->
-            val tagsFile = requireNotNull(
-                BundleCompat.getParcelable(
-                    f.requireArguments(),
-                    "tagsFile",
-                    TagsFile::class.java
+        FragmentScenario.launch(TagsDialog::class.java, args, R.style.Theme_Light, factory).use { scenario ->
+            scenario.moveToState(Lifecycle.State.STARTED)
+            scenario.onFragment { f ->
+                val tagsFile = requireNotNull(
+                    BundleCompat.getParcelable(
+                        f.requireArguments(),
+                        "tagsFile",
+                        TagsFile::class.java
+                    )
                 )
-            )
 
-            val dataFromArguments = tagsFile.getData()
+                val dataFromArguments = tagsFile.getData()
 
-            assertThat(dataFromArguments.allTags, containsInAnyOrder(allTags))
+                assertThat(dataFromArguments.allTags, containsInAnyOrder(allTags))
+            }
         }
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/pages/DeckOptionsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/pages/DeckOptionsTest.kt
index 5a34b48fc8cc..8c6761b627e0 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/pages/DeckOptionsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/pages/DeckOptionsTest.kt
@@ -39,18 +39,19 @@ class DeckOptionsTest : RobolectricTest() {
         // Launch deck options
         val intent = DeckOptions.getIntent(targetContext, col.decks.selected())
 
-        val scenario = ActivityScenario.launch<SingleFragmentActivity>(intent)
-        scenario.moveToState(Lifecycle.State.RESUMED)
-        scenario.onActivity { activity ->
-            assertThat("Activity should not be finishing", !activity.isFinishing)
+        ActivityScenario.launch<SingleFragmentActivity>(intent).use { scenario ->
+            scenario.moveToState(Lifecycle.State.RESUMED)
+            scenario.onActivity { activity ->
+                assertThat("Activity should not be finishing", !activity.isFinishing)
 
-            // Perform system-level back press
-            pressBack()
+                // Perform system-level back press
+                pressBack()
 
-            // Discard on modal
-            clickAlertDialogButton(DialogInterface.BUTTON_POSITIVE, true)
+                // Discard on modal
+                clickAlertDialogButton(DialogInterface.BUTTON_POSITIVE, true)
 
-            assertThat("Activity should be finishing", activity.isFinishing)
+                assertThat("Activity should be finishing", activity.isFinishing)
+            }
         }
     }
 
@@ -59,24 +60,25 @@ class DeckOptionsTest : RobolectricTest() {
         // Launch deck options
         val intent = DeckOptions.getIntent(targetContext, col.decks.selected())
 
-        val scenario = ActivityScenario.launch<SingleFragmentActivity>(intent)
-        scenario.moveToState(Lifecycle.State.RESUMED)
-        scenario.onActivity { activity ->
-            assertThat("Activity should not be finishing", !activity.isFinishing)
-        }
+        ActivityScenario.launch<SingleFragmentActivity>(intent).use { scenario ->
+            scenario.moveToState(Lifecycle.State.RESUMED)
+            scenario.onActivity { activity ->
+                assertThat("Activity should not be finishing", !activity.isFinishing)
+            }
 
-        // Perform toolbar up button press
-        try {
-            onView(withContentDescription("Navigate up")).perform(click())
-        } catch (ex: NoMatchingViewException) {
-            Timber.d("Toolbar UP button not found. Is english locale being used?")
-            return // Abort
-        }
+            // Perform toolbar up button press
+            try {
+                onView(withContentDescription("Navigate up")).perform(click())
+            } catch (ex: NoMatchingViewException) {
+                Timber.d("Toolbar UP button not found. Is english locale being used?")
+                return // Abort
+            }
 
-        scenario.onActivity { activity ->
-            // Discard on modal
-            clickAlertDialogButton(DialogInterface.BUTTON_POSITIVE, true)
-            assertThat("Activity should be finishing", activity.isFinishing)
+            scenario.onActivity { activity ->
+                // Discard on modal
+                clickAlertDialogButton(DialogInterface.BUTTON_POSITIVE, true)
+                assertThat("Activity should be finishing", activity.isFinishing)
+            }
         }
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferencesTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferencesTest.kt
index 38c04f212dc3..718cbb10f5d7 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferencesTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferencesTest.kt
@@ -72,12 +72,12 @@ class PreferencesTest : RobolectricTest() {
     /** checks if any of the Preferences fragments throws while being created */
     @Test
     fun fragmentsDoNotThrowOnCreation() {
-        val activityScenario = ActivityScenario.launch(Preferences::class.java)
-
-        activityScenario.onActivity { activity ->
-            PreferenceTestUtils.getAllPreferencesFragments(activity).forEach {
-                activity.supportFragmentManager.commitNow {
-                    add(R.id.settings_container, it)
+        ActivityScenario.launch(Preferences::class.java).use { activityScenario ->
+            activityScenario.onActivity { activity ->
+                PreferenceTestUtils.getAllPreferencesFragments(activity).forEach {
+                    activity.supportFragmentManager.commitNow {
+                        add(R.id.settings_container, it)
+                    }
                 }
             }
         }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivityTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivityTest.kt
index 181ba08627f5..a6969a559aad 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivityTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivityTest.kt
@@ -71,8 +71,10 @@ class PermissionsActivityTest : RobolectricTest() {
             ApplicationProvider.getApplicationContext(),
             permissionSet
         )
-        ActivityScenario.launch<PermissionsActivity>(intent).onActivity { activity ->
-            action.perform(activity)
+        ActivityScenario.launch<PermissionsActivity>(intent).use { scenario ->
+            scenario.onActivity { activity ->
+                action.perform(activity)
+            }
         }
     }