diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt
index 75f01c568b69f..d4acae50911b8 100644
--- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/tv/TvPipTestBase.kt
@@ -52,7 +52,7 @@ abstract class TvPipTestBase(rotationName: String, rotation: Int)
 
     @After
     open fun tearDown() {
-        Assume.assumeTrue(isTelevision)
+        if (!isTelevision) return
 
         testApp.forceStop()