diff --git a/tests/FlickerTests/Android.bp b/tests/FlickerTests/Android.bp
index 070dacbcd91f1..5161fba026db2 100644
--- a/tests/FlickerTests/Android.bp
+++ b/tests/FlickerTests/Android.bp
@@ -28,6 +28,7 @@ android_test {
         "flickerlib",
         "truth-prebuilt",
         "app-helpers-core",
+        "launcher-helper-lib",
         "launcher-aosp-tapl"
     ],
 }
diff --git a/tests/FlickerTests/AndroidTest.xml b/tests/FlickerTests/AndroidTest.xml
index 58df2a806a1e7..68c99a35e5d0e 100644
--- a/tests/FlickerTests/AndroidTest.xml
+++ b/tests/FlickerTests/AndroidTest.xml
@@ -27,7 +27,7 @@
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="com.android.server.wm.flicker"/>
-        <option name="exclude-annotation" value="org.junit.Ignore" />
+        <option name="exclude-annotation" value="androidx.test.filters.FlakyTest" />
         <option name="shell-timeout" value="6600s" />
         <option name="test-timeout" value="6000s" />
         <option name="hidden-api-checks" value="false" />
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.kt
index f871ea59ea717..43cfdffb6efb2 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.kt
@@ -20,22 +20,24 @@ import android.platform.helpers.IAppHelper
 import android.util.Rational
 import android.view.Surface
 import androidx.test.InstrumentationRegistry
+import androidx.test.filters.FlakyTest
 import androidx.test.filters.LargeTest
 import androidx.test.runner.AndroidJUnit4
 import androidx.test.uiautomator.UiDevice
 import com.android.server.wm.flicker.helpers.ImeAppHelper
 import com.android.server.wm.flicker.helpers.PipAppHelper
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
 
 /**
  * Tests to help debug individual transitions, capture video recordings and create test cases.
+ *
+ * Not actual tests
  */
 @LargeTest
-@Ignore("Used for debugging transitions used in FlickerTests.")
+@FlakyTest
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 class DebugTest {
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/NonRotationTestBase.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/NonRotationTestBase.kt
index 653fecd5219fe..1f8150c0977bf 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/NonRotationTestBase.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/NonRotationTestBase.kt
@@ -18,7 +18,6 @@ package com.android.server.wm.flicker
 
 import android.view.Surface
 import androidx.test.filters.FlakyTest
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runners.Parameterized
 
@@ -27,7 +26,6 @@ abstract class NonRotationTestBase(
     protected val beginRotation: Int
 ) : FlickerTestBase() {
     @FlakyTest(bugId = 141361128)
-    @Ignore("Waiting bug feedback")
     @Test
     fun checkCoveredRegion_noUncoveredRegions() {
         val displayBounds = WindowUtils.getDisplayBounds(beginRotation)
@@ -38,7 +36,6 @@ abstract class NonRotationTestBase(
     }
 
     @FlakyTest(bugId = 141361128)
-    @Ignore("Waiting bug feedback")
     @Test
     fun checkVisibility_navBarLayerIsAlwaysVisible() {
         checkResults {
@@ -48,7 +45,6 @@ abstract class NonRotationTestBase(
     }
 
     @FlakyTest(bugId = 141361128)
-    @Ignore("Waiting bug feedback")
     @Test
     fun checkVisibility_statusBarLayerIsAlwaysVisible() {
         checkResults {
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/RotationTestBase.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/RotationTestBase.kt
index 873d60771cb40..dfc3c07d54174 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/RotationTestBase.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/RotationTestBase.kt
@@ -18,7 +18,6 @@ package com.android.server.wm.flicker
 
 import android.view.Surface
 import androidx.test.filters.FlakyTest
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runners.Parameterized
 
@@ -29,7 +28,6 @@ abstract class RotationTestBase(
     protected val endRotation: Int
 ) : FlickerTestBase() {
     @FlakyTest(bugId = 140855415)
-    @Ignore("Waiting bug feedback")
     @Test
     fun checkVisibility_navBarWindowIsAlwaysVisible() {
         checkResults {
@@ -39,7 +37,6 @@ abstract class RotationTestBase(
     }
 
     @FlakyTest(bugId = 140855415)
-    @Ignore("Waiting bug feedback")
     @Test
     fun checkVisibility_statusBarWindowIsAlwaysVisible() {
         checkResults {
@@ -86,7 +83,6 @@ abstract class RotationTestBase(
     }
 
     @FlakyTest(bugId = 140855415)
-    @Ignore("Waiting bug feedback")
     @Test
     fun checkVisibility_navBarLayerIsAlwaysVisible() {
         checkResults {
@@ -96,7 +92,6 @@ abstract class RotationTestBase(
     }
 
     @FlakyTest(bugId = 140855415)
-    @Ignore("Waiting bug feedback")
     @Test
     fun checkVisibility_statusBarLayerIsAlwaysVisible() {
         checkResults {
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt
index 6946618806b89..814cdcf5e114c 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt
@@ -22,7 +22,6 @@ import com.android.server.wm.flicker.CommonTransitions
 import com.android.server.wm.flicker.TransitionRunner
 import com.android.server.wm.flicker.helpers.ImeAppAutoFocusHelper
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -49,21 +48,18 @@ class CloseImeAutoOpenWindowToAppTest(
                 .includeJankyRuns().build()
 
     @FlakyTest(bugId = 141458352)
-    @Ignore("Waiting bug feedback")
     @Test
     override fun checkVisibility_imeLayerBecomesInvisible() {
         super.checkVisibility_imeLayerBecomesInvisible()
     }
 
     @FlakyTest(bugId = 141458352)
-    @Ignore("Waiting bug feedback")
     @Test
     override fun checkVisibility_imeAppLayerIsAlwaysVisible() {
         super.checkVisibility_imeAppLayerIsAlwaysVisible()
     }
 
     @FlakyTest(bugId = 141458352)
-    @Ignore("Waiting bug feedback")
     @Test
     override fun checkVisibility_imeAppWindowIsAlwaysVisible() {
         super.checkVisibility_imeAppWindowIsAlwaysVisible()
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt
index a1030d8248b7c..c2025b6da2044 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt
@@ -22,7 +22,6 @@ import com.android.server.wm.flicker.CommonTransitions
 import com.android.server.wm.flicker.TransitionRunner
 import com.android.server.wm.flicker.helpers.ImeAppAutoFocusHelper
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -49,21 +48,18 @@ class CloseImeAutoOpenWindowToHomeTest(
                 .includeJankyRuns().build()
 
     @FlakyTest(bugId = 141458352)
-    @Ignore("Waiting bug feedback")
     @Test
     override fun checkVisibility_imeWindowBecomesInvisible() {
         super.checkVisibility_imeWindowBecomesInvisible()
     }
 
     @FlakyTest(bugId = 141458352)
-    @Ignore("Waiting bug feedback")
     @Test
     override fun checkVisibility_imeLayerBecomesInvisible() {
         super.checkVisibility_imeLayerBecomesInvisible()
     }
 
     @FlakyTest(bugId = 157449248)
-    @Ignore("Waiting bug feedback")
     @Test
     override fun checkVisibility_imeAppWindowBecomesInvisible() {
         super.checkVisibility_imeAppWindowBecomesInvisible()
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt
index 6e7c92b97bfbe..b38262e9f2983 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt
@@ -16,6 +16,7 @@
 
 package com.android.server.wm.flicker.ime
 
+import androidx.test.filters.FlakyTest
 import androidx.test.filters.LargeTest
 import com.android.server.wm.flicker.CommonTransitions
 import com.android.server.wm.flicker.LayersTraceSubject
@@ -24,7 +25,6 @@ import com.android.server.wm.flicker.TransitionRunner
 import com.android.server.wm.flicker.WmTraceSubject
 import com.android.server.wm.flicker.helpers.ImeAppHelper
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -50,7 +50,7 @@ open class CloseImeWindowToAppTest(
                 instrumentation, uiDevice, beginRotation)
                 .includeJankyRuns().build()
 
-    @Ignore("Flaky. Pending debug")
+    @FlakyTest
     @Test
     open fun checkVisibility_imeLayerBecomesInvisible() {
         checkResults {
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt
index ed8bd2a5fe83b..ca04babfa0f19 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt
@@ -25,7 +25,6 @@ import com.android.server.wm.flicker.TransitionRunner
 import com.android.server.wm.flicker.WmTraceSubject
 import com.android.server.wm.flicker.helpers.ImeAppHelper
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -63,7 +62,6 @@ open class CloseImeWindowToHomeTest(
     }
 
     @FlakyTest(bugId = 153739621)
-    @Ignore
     @Test
     open fun checkVisibility_imeLayerBecomesInvisible() {
         checkResults {
@@ -77,7 +75,6 @@ open class CloseImeWindowToHomeTest(
     }
 
     @FlakyTest(bugId = 153739621)
-    @Ignore
     @Test
     fun checkVisibility_imeAppLayerBecomesInvisible() {
         checkResults {
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt
index 943a525929107..88b8854079351 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt
@@ -25,7 +25,6 @@ import com.android.server.wm.flicker.StandardAppHelper
 import com.android.server.wm.flicker.TransitionRunner
 import com.android.server.wm.flicker.WmTraceSubject
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -63,7 +62,6 @@ class OpenAppColdTest(
     }
 
     @FlakyTest(bugId = 140855415)
-    @Ignore("Waiting bug feedback")
     @Test
     fun checkZOrder_appWindowReplacesLauncherAsTopWindow() {
         checkResults {
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt
index 7964d949e737c..f0bc3f00338a7 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt
@@ -25,7 +25,6 @@ import com.android.server.wm.flicker.StandardAppHelper
 import com.android.server.wm.flicker.TransitionRunner
 import com.android.server.wm.flicker.WmTraceSubject
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -63,7 +62,6 @@ class OpenAppWarmTest(
     }
 
     @FlakyTest(bugId = 140855415)
-    @Ignore("Waiting bug feedback")
     @Test
     fun checkZOrder_appWindowReplacesLauncherAsTopWindow() {
         checkResults {
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToAppTest.kt
index f939a7915e74a..89ffb7a57b738 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToAppTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToAppTest.kt
@@ -23,7 +23,6 @@ import com.android.server.wm.flicker.TransitionRunner
 import com.android.server.wm.flicker.WmTraceSubject
 import com.android.server.wm.flicker.helpers.PipAppHelper
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -37,7 +36,6 @@ import org.junit.runners.Parameterized
 @RunWith(Parameterized::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @FlakyTest(bugId = 152738416)
-@Ignore("Waiting bug feedback")
 class PipToAppTest(
     beginRotationName: String,
     beginRotation: Int
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToHomeTest.kt
index ecfcd8298c3fd..8591360cff602 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToHomeTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToHomeTest.kt
@@ -23,7 +23,6 @@ import com.android.server.wm.flicker.TransitionRunner
 import com.android.server.wm.flicker.WmTraceSubject
 import com.android.server.wm.flicker.helpers.PipAppHelper
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -37,7 +36,6 @@ import org.junit.runners.Parameterized
 @RunWith(Parameterized::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @FlakyTest(bugId = 152738416)
-@Ignore("Waiting bug feedback")
 class PipToHomeTest(
     beginRotationName: String,
     beginRotation: Int
@@ -47,7 +45,6 @@ class PipToHomeTest(
                 uiDevice, beginRotation)
                 .includeJankyRuns().build()
 
-    @Ignore
     @Test
     fun checkVisibility_backgroundWindowVisibleBehindPipLayer() {
         checkResults {
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt
index 7a581d066c2bf..fb1cb399e8bcb 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt
@@ -17,6 +17,7 @@
 package com.android.server.wm.flicker.rotation
 
 import android.util.Log
+import androidx.test.filters.FlakyTest
 import androidx.test.filters.LargeTest
 import com.android.server.wm.flicker.CommonTransitions
 import com.android.server.wm.flicker.LayersTraceSubject
@@ -25,7 +26,6 @@ import com.android.server.wm.flicker.StandardAppHelper
 import com.android.server.wm.flicker.TransitionRunner
 import com.android.server.wm.flicker.WindowUtils
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -67,7 +67,7 @@ class ChangeAppRotationTest(
         }
     }
 
-    @Ignore("Flaky. Pending debug")
+    @FlakyTest
     @Test
     fun checkVisibility_screenshotLayerBecomesInvisible() {
         checkResults {
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt
index d53af6f53bf23..1cd19983f3b1f 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt
@@ -28,7 +28,6 @@ import com.android.server.wm.flicker.TransitionRunner
 import com.android.server.wm.flicker.WindowUtils
 import com.android.server.wm.flicker.testapp.ActivityOptions
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -42,7 +41,6 @@ import org.junit.runners.Parameterized
 @RunWith(Parameterized::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @FlakyTest(bugId = 147659548)
-@Ignore("Waiting bug feedback")
 class SeamlessAppRotationTest(
     private val intent: Intent,
     beginRotationName: String,
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/ResizeSplitScreenTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/ResizeSplitScreenTest.kt
index b6cce266ab884..6b597e5807ea3 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/ResizeSplitScreenTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/ResizeSplitScreenTest.kt
@@ -38,7 +38,6 @@ import com.android.server.wm.flicker.helpers.ImeAppHelper
 import com.google.common.truth.Truth
 import org.junit.AfterClass
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -53,7 +52,6 @@ import org.junit.runners.MethodSorters
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @FlakyTest(bugId = 159096424)
-@Ignore("Waiting bug feedback")
 class ResizeSplitScreenTest : FlickerTestBase() {
     init {
         testApp = StandardAppHelper(instrumentation,
@@ -97,7 +95,7 @@ class ResizeSplitScreenTest : FlickerTestBase() {
     }
 
     @Test
-    @Ignore("Waiting feedback")
+    @FlakyTest
     fun checkPosition_appsStartingBounds() {
         val displayBounds = WindowUtils.getDisplayBounds()
         checkResults { result: TransitionResult ->
@@ -122,7 +120,7 @@ class ResizeSplitScreenTest : FlickerTestBase() {
     }
 
     @Test
-    @Ignore("Waiting feedback")
+    @FlakyTest
     fun checkPosition_appsEndingBounds() {
         val displayBounds = WindowUtils.getDisplayBounds()
         checkResults { result: TransitionResult ->
@@ -166,7 +164,6 @@ class ResizeSplitScreenTest : FlickerTestBase() {
 
     @Test
     @FlakyTest(bugId = 156223549)
-    @Ignore("Waiting bug feedback")
     fun checkVisibility_topAppWindowIsAlwaysVisible() {
         checkResults {
             WmTraceSubject.assertThat(it)
@@ -177,7 +174,6 @@ class ResizeSplitScreenTest : FlickerTestBase() {
 
     @Test
     @FlakyTest(bugId = 156223549)
-    @Ignore("Waiting bug feedback")
     fun checkVisibility_bottomAppWindowIsAlwaysVisible() {
         checkResults {
             WmTraceSubject.assertThat(it)