diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
index e55b93effd..a5efd0f795 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
@@ -18,7 +18,6 @@ import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.ui.robots.downloadRobot
-import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 
 /**
@@ -250,48 +249,4 @@ class ContextMenusTest {
             verifyNoLinkImageContextMenuItems(imageResource.url)
         }
     }
-
-    @SmokeTest
-    @Test
-    fun shareSelectedTextTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            longClickLink(genericURL.content)
-        }.clickShareSelectedText {
-            verifyAndroidShareLayout()
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun selectAndSearchTextTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            longClickAndSearchText("Search", "content")
-            mDevice.waitForIdle()
-            verifyTabCounter("2")
-            verifyUrl("google")
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun privateSelectAndSearchTextTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-        }.togglePrivateBrowsingMode()
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            longClickAndSearchText("Private Search", "content")
-            mDevice.waitForIdle()
-            verifyTabCounter("2")
-            verifyUrl("google")
-        }
-    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
index d7df4192c2..7ee1d937af 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@@ -38,8 +38,6 @@ import org.mozilla.fenix.ui.robots.customTabScreen
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 import org.mozilla.fenix.ui.robots.notificationShade
-import org.mozilla.fenix.ui.robots.openEditURLView
-import org.mozilla.fenix.ui.robots.searchScreen
 
 /**
  * Test Suite that contains a part of the Smoke and Sanity tests defined in TestRail:
@@ -676,45 +674,6 @@ class SmokeTest {
         mDevice.pressBack()
     }
 
-    @Test
-    fun copyTextTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            longClickAndCopyText("content")
-        }.openNavigationToolbar {
-            openEditURLView()
-        }
-
-        searchScreen {
-            clickClearButton()
-            longClickToolbar()
-            clickPasteText()
-            verifyTypedToolbarText("content")
-        }
-    }
-
-    @Test
-    fun selectAllAndCopyTextTest() {
-        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-            longClickAndCopyText("content", true)
-        }.openNavigationToolbar {
-            openEditURLView()
-        }
-
-        searchScreen {
-            clickClearButton()
-            longClickToolbar()
-            clickPasteText()
-            // with Select all, some white space is copied over, so we need to include that too
-            verifyTypedToolbarText("  Page content: 1 ")
-        }
-    }
-
     @Test
     fun goToHomeScreenBottomToolbarTest() {
         val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TextSelectionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TextSelectionTest.kt
new file mode 100644
index 0000000000..b1121c06b4
--- /dev/null
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/TextSelectionTest.kt
@@ -0,0 +1,129 @@
+package org.mozilla.fenix.ui
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.helpers.AndroidAssetDispatcher
+import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
+import org.mozilla.fenix.helpers.RetryTestRule
+import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.ui.robots.homeScreen
+import org.mozilla.fenix.ui.robots.navigationToolbar
+import org.mozilla.fenix.ui.robots.openEditURLView
+import org.mozilla.fenix.ui.robots.searchScreen
+
+class TextSelectionTest {
+    private lateinit var mDevice: UiDevice
+    private lateinit var mockWebServer: MockWebServer
+
+    @get:Rule
+    val activityIntentTestRule = HomeActivityIntentTestRule.withDefaultSettingsOverrides()
+
+    @Rule
+    @JvmField
+    val retryTestRule = RetryTestRule(3)
+
+    @Before
+    fun setUp() {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        mockWebServer = MockWebServer().apply {
+            dispatcher = AndroidAssetDispatcher()
+            start()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+    }
+
+    @SmokeTest
+    @Test
+    fun selectAllAndCopyTextTest() {
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericURL.url) {
+            longClickAndCopyText("content", true)
+        }.openNavigationToolbar {
+            openEditURLView()
+        }
+
+        searchScreen {
+            clickClearButton()
+            longClickToolbar()
+            clickPasteText()
+            // with Select all, some white space is copied over, so we need to include that too
+            verifyTypedToolbarText("  Page content: 1 ")
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun copyTextTest() {
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericURL.url) {
+            longClickAndCopyText("content")
+        }.openNavigationToolbar {
+            openEditURLView()
+        }
+
+        searchScreen {
+            clickClearButton()
+            longClickToolbar()
+            clickPasteText()
+            verifyTypedToolbarText("content")
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun shareSelectedTextTest() {
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericURL.url) {
+            longClickLink(genericURL.content)
+        }.clickShareSelectedText {
+            verifyAndroidShareLayout()
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun selectAndSearchTextTest() {
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericURL.url) {
+            longClickAndSearchText("Search", "content")
+            mDevice.waitForIdle()
+            verifyTabCounter("2")
+            verifyUrl("google")
+        }
+    }
+
+    @SmokeTest
+    @Test
+    fun privateSelectAndSearchTextTest() {
+        val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        homeScreen {
+        }.togglePrivateBrowsingMode()
+
+        navigationToolbar {
+        }.enterURLAndEnterToBrowser(genericURL.url) {
+            longClickAndSearchText("Private Search", "content")
+            mDevice.waitForIdle()
+            verifyTabCounter("2")
+            verifyUrl("google")
+        }
+    }
+}