diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
index 60c7a6f19..4d6df1534 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt
@@ -29,6 +29,7 @@ class CrashReportingTest {
             isPocketEnabled = false,
             isJumpBackInCFREnabled = false,
             isWallpaperOnboardingEnabled = false,
+            isTCPCFREnabled = false,
         ),
     ) { it.activity }
 
@@ -73,7 +74,6 @@ class CrashReportingTest {
         }
     }
 
-    @Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/25029")
     @SmokeTest
     @Test
     fun useAppWhileTabIsCrashedTest() {
@@ -106,7 +106,6 @@ class CrashReportingTest {
 
     @SmokeTest
     @Test
-    @Ignore("Failing after compose migration. See: https://github.com/mozilla-mobile/fenix/issues/26087")
     fun privateBrowsingUseAppWhileTabIsCrashedTest() {
         val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
         val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
@@ -120,7 +119,6 @@ class CrashReportingTest {
         }.openNewTab {
         }.submitQuery(secondWebPage.url.toString()) {
             waitForPageToLoad()
-            verifyPageContent("Page content: 2")
         }
 
         navigationToolbar {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
index 2cfd7ad44..dc934ca9d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
@@ -678,12 +678,22 @@ class BrowserRobot {
         }
 
         fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
-            mDevice.findObject(
-                UiSelector().descriptionContains("Tap to switch tabs."),
-            ).waitForExists(waitingTime)
+            mDevice.waitForObjects(
+                mDevice.findObject(
+                    UiSelector()
+                        .resourceId("$packageName:id/mozac_browser_toolbar_browser_actions"),
+                ),
+                waitingTime,
+            )
 
             tabsCounter().click()
-            mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/tab_layout")))
+
+            mDevice.waitForObjects(
+                mDevice.findObject(
+                    UiSelector().resourceId("$packageName:id/new_tab_button"),
+                ),
+                waitingTime,
+            )
 
             TabDrawerRobot().interact()
             return TabDrawerRobot.Transition()
@@ -853,7 +863,8 @@ private fun assertMenuButton() {
         .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
 }
 
-private fun tabsCounter() = mDevice.findObject(By.res("$packageName:id/counter_root"))
+private fun tabsCounter() =
+    mDevice.findObject(By.res("$packageName:id/mozac_browser_toolbar_browser_actions"))
 
 private var progressBar =
     mDevice.findObject(