diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java b/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java
index a050464..36c591e 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java
@@ -22,8 +22,6 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.launcher3.tapl.KeyboardQuickSwitch;
-import com.android.launcher3.tapl.LaunchedAppState;
-import com.android.launcher3.tapl.Taskbar;
 import com.android.launcher3.taskbar.KeyboardQuickSwitchController;
 import com.android.launcher3.ui.AbstractLauncherUiTest;
 
@@ -38,7 +36,6 @@
     private enum TestSurface {
         HOME(true),
         LAUNCHED_APP(false),
-        TASKBAR_ALL_APPS(false),
         HOME_ALL_APPS(true),
         WIDGETS(true);
 
@@ -85,11 +82,6 @@
     }
 
     @Test
-    public void testDismiss_fromTaskbarAllApps() {
-        runTest(TestSurface.TASKBAR_ALL_APPS, TestCase.DISMISS);
-    }
-
-    @Test
     public void testDismiss_fromHomeAllApps() {
         runTest(TestSurface.HOME_ALL_APPS, TestCase.DISMISS);
     }
@@ -110,11 +102,6 @@
     }
 
     @Test
-    public void testLaunchLastTask_fromTaskbarAllApps() {
-        runTest(TestSurface.TASKBAR_ALL_APPS, TestCase.LAUNCH_LAST_APP);
-    }
-
-    @Test
     public void testLaunchLastTask_fromHomeAllApps() {
         runTest(TestSurface.HOME_ALL_APPS, TestCase.LAUNCH_LAST_APP);
     }
@@ -135,11 +122,6 @@
     }
 
     @Test
-    public void testLaunchSelectedTask_fromTaskbarAllApps() {
-        runTest(TestSurface.TASKBAR_ALL_APPS, TestCase.LAUNCH_SELECTED_APP);
-    }
-
-    @Test
     public void testLaunchSelectedTask_fromHomeAllApps() {
         runTest(TestSurface.HOME_ALL_APPS, TestCase.LAUNCH_SELECTED_APP);
     }
@@ -160,11 +142,6 @@
     }
 
     @Test
-    public void testLaunchOverviewTask_fromTaskbarAllApps() {
-        runTest(TestSurface.TASKBAR_ALL_APPS, TestCase.LAUNCH_OVERVIEW);
-    }
-
-    @Test
     public void testLaunchOverviewTask_fromHomeAllApps() {
         runTest(TestSurface.HOME_ALL_APPS, TestCase.LAUNCH_OVERVIEW);
     }
@@ -188,12 +165,6 @@
                 mLauncher.setIgnoreTaskbarVisibility(true);
                 kqs = mLauncher.getLaunchedAppState().showQuickSwitchView();
                 break;
-            case TASKBAR_ALL_APPS:
-                LaunchedAppState launchedApp = mLauncher.getLaunchedAppState();
-                Taskbar taskbar = mLauncher.isTransientTaskbar()
-                        ? launchedApp.swipeUpToUnstashTaskbar() : launchedApp.getTaskbar();
-                kqs = taskbar.openAllApps().showQuickSwitchView();
-                break;
             case HOME_ALL_APPS:
                 kqs = mLauncher.goHome().switchToAllApps().showQuickSwitchView();
                 break;