diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java
index 8343a9122e186..c0fccca8ddae7 100644
--- a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java
@@ -456,7 +456,8 @@ public void fullyDrawn() {
           "reportFullyDrawn isn't used in API level " + version, flutterActivity.isFullyDrawn());
     }
 
-    for (int version = Build.VERSION_CODES.Q; version < Build.VERSION_CODES.S; version++) {
+    final int versionCodeS = 31;
+    for (int version = Build.VERSION_CODES.Q; version < versionCodeS; version++) {
       TestUtils.setApiVersion(version);
       flutterActivity.onFlutterUiDisplayed();
       assertTrue(