diff --git a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
index 858cb38..f98957e 100644
--- a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
+++ b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
@@ -114,21 +114,20 @@
             throw new RuntimeException(e);
         }
 
-        final Matcher launcherBuildMatcher = LAUNCHER_BUILD.matcher(launcherVersion);
+        final String platformVersion = Build.VERSION.INCREMENTAL;
 
+        Log.d(TAG, "Launcher: " + launcherVersion + ", platform: " + platformVersion);
+
+        final Matcher launcherBuildMatcher = LAUNCHER_BUILD.matcher(launcherVersion);
         if (!launcherBuildMatcher.find()) {
             throw new AssertionError("Launcher build match not found");
         }
 
-        final String platformVersion = Build.VERSION.INCREMENTAL;
         final Matcher platformBuildMatcher = PLATFORM_BUILD.matcher(platformVersion);
-
         if (!platformBuildMatcher.find()) {
             throw new AssertionError("Platform build match not found");
         }
 
-        Log.d(TAG, "Launcher: " + launcherVersion + ", platform: " + platformVersion);
-
         final int runFlavor;
 
         if (launcherBuildMatcher.group("local") != null && (
