diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 86a5769564..3e84440b0c 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -118,13 +118,13 @@ public abstract class AbstractLauncherUiTest {
                 int apiLevel = (int) getInt.invoke(null, "ro.product.first_api_level", 0);
 
                 if (apiLevel >= Build.VERSION_CODES.P) {
-                    setActiveOverlay(NAV_BAR_MODE_GESTURAL_OVERLAY,
-                            LauncherInstrumentation.NavigationModel.ZERO_BUTTON);
-                }
-                if (apiLevel >= Build.VERSION_CODES.O && apiLevel < Build.VERSION_CODES.P) {
                     setActiveOverlay(NAV_BAR_MODE_2BUTTON_OVERLAY,
                             LauncherInstrumentation.NavigationModel.TWO_BUTTON);
                 }
+                if (apiLevel >= Build.VERSION_CODES.O && apiLevel < Build.VERSION_CODES.P) {
+                    setActiveOverlay(NAV_BAR_MODE_GESTURAL_OVERLAY,
+                            LauncherInstrumentation.NavigationModel.ZERO_BUTTON);
+                }
                 if (apiLevel < Build.VERSION_CODES.O) {
                     setActiveOverlay(NAV_BAR_MODE_3BUTTON_OVERLAY,
                             LauncherInstrumentation.NavigationModel.THREE_BUTTON);