diff --git a/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java b/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java
index 9c0b2bf..4ca3563 100644
--- a/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java
+++ b/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java
@@ -23,6 +23,7 @@
 import android.content.Intent;
 
 import com.android.launcher3.tapl.LauncherInstrumentation;
+import com.android.launcher3.tapl.Overview;
 import com.android.launcher3.tapl.Taskbar;
 import com.android.launcher3.ui.AbstractLauncherUiTest;
 import com.android.launcher3.ui.TaplTestsLauncher3;
@@ -57,7 +58,10 @@
                 "com.android.launcher3.testcomponent.BaseTestingActivity");
         mLauncherLayout = TestUtil.setLauncherDefaultLayout(mTargetContext, layoutBuilder);
         TaplTestsLauncher3.initialize(this);
-
+        Overview overview = mLauncher.getWorkspace().switchToOverview();
+        if (overview.hasTasks()) {
+            overview.dismissAllTasks();
+        }
         startAppFast(CALCULATOR_APP_PACKAGE);
         mLauncher.enableBlockTimeout(true);
         mLauncher.showTaskbarIfHidden();
@@ -65,7 +69,6 @@
 
     @After
     public void tearDown() throws Exception {
-        setTaskbarMode(mLauncher, mTaskbarWasInTransientMode);
         mLauncher.enableBlockTimeout(false);
         if (mLauncherLayout != null) {
             mLauncherLayout.close();
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java b/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java
index ee0eeb2..1b5313b 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java
@@ -29,13 +29,6 @@
 @RunWith(AndroidJUnit4.class)
 public class TaplTestsPersistentTaskbar extends AbstractTaplTestsTaskbar {
 
-    @Override
-    public void setUp() throws Exception {
-        mTaskbarWasInTransientMode = isTaskbarInTransientMode(mTargetContext);
-        setTaskbarMode(mLauncher, false);
-        super.setUp();
-    }
-
     @Test
     @TaskbarModeSwitch(mode = PERSISTENT)
     public void testHideShowTaskbar() {
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsTaskbar.java b/quickstep/tests/src/com/android/quickstep/TaplTestsTaskbar.java
index 021e118..40be480 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsTaskbar.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsTaskbar.java
@@ -20,7 +20,6 @@
 
 import androidx.test.filters.LargeTest;
 
-import com.android.launcher3.tapl.LauncherInstrumentation;
 import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;
 
 import org.junit.Test;
@@ -58,14 +57,19 @@
         super.setUp();
     }
 
+    @Override
+    public void tearDown() throws Exception {
+        setTaskbarMode(mLauncher, mTaskbarWasInTransientMode);
+        super.tearDown();
+    }
+
     @Test
     public void testLaunchApp() {
         getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
         // We are using parameterized test runner to share code between different test cases with
         // taskbar variants. But, sometimes we only need to assert things for particular Taskbar
         // variants.
-        if (isTaskbarTestModeTransient() && mLauncher.getNavigationModel()
-                != LauncherInstrumentation.NavigationModel.THREE_BUTTON) {
+        if (isTaskbarTestModeTransient()) {
             mLauncher.getLaunchedAppState().assertTaskbarHidden();
         }
     }
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsTransientTaskbar.java b/quickstep/tests/src/com/android/quickstep/TaplTestsTransientTaskbar.java
index 6b61f18..b58fe29 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsTransientTaskbar.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsTransientTaskbar.java
@@ -32,13 +32,6 @@
 @RunWith(AndroidJUnit4.class)
 public class TaplTestsTransientTaskbar extends AbstractTaplTestsTaskbar {
 
-    @Override
-    public void setUp() throws Exception {
-        mTaskbarWasInTransientMode = isTaskbarInTransientMode(mTargetContext);
-        setTaskbarMode(mLauncher, true);
-        super.setUp();
-    }
-
     @Test
     @TaskbarModeSwitch(mode = TRANSIENT)
     public void testShowTaskbarUnstashHintOnHover() {