diff --git a/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk b/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk
index f1a3fdd2..3c9abd3a 100644
Binary files a/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk and b/wa/workloads/androbench/com.arm.wa.uiauto.androbench.apk differ
diff --git a/wa/workloads/androbench/uiauto/app/src/main/java/com/arm/wa/uiauto/androbench/UiAutomation.java b/wa/workloads/androbench/uiauto/app/src/main/java/com/arm/wa/uiauto/androbench/UiAutomation.java
index 64bdbc55..ae482c32 100755
--- a/wa/workloads/androbench/uiauto/app/src/main/java/com/arm/wa/uiauto/androbench/UiAutomation.java
+++ b/wa/workloads/androbench/uiauto/app/src/main/java/com/arm/wa/uiauto/androbench/UiAutomation.java
@@ -41,6 +41,11 @@ public class UiAutomation extends BaseUiAutomation {
 
     public static String TAG = "UXPERF";
 
+    @Test
+    public void setup() throws Exception {
+        dismissAndroidVersionPopup();
+    }
+
     @Test
     public void runWorkload() throws Exception {
         runBenchmark();
diff --git a/wa/workloads/antutu/com.arm.wa.uiauto.antutu.apk b/wa/workloads/antutu/com.arm.wa.uiauto.antutu.apk
index 0fe3d847..d658ec79 100644
Binary files a/wa/workloads/antutu/com.arm.wa.uiauto.antutu.apk and b/wa/workloads/antutu/com.arm.wa.uiauto.antutu.apk differ
diff --git a/wa/workloads/antutu/uiauto/app/src/main/java/com/arm/wa/uiauto/antutu/UiAutomation.java b/wa/workloads/antutu/uiauto/app/src/main/java/com/arm/wa/uiauto/antutu/UiAutomation.java
index a5edebaa..dbf76cec 100755
--- a/wa/workloads/antutu/uiauto/app/src/main/java/com/arm/wa/uiauto/antutu/UiAutomation.java
+++ b/wa/workloads/antutu/uiauto/app/src/main/java/com/arm/wa/uiauto/antutu/UiAutomation.java
@@ -42,6 +42,11 @@ public class UiAutomation extends BaseUiAutomation {
     public static String TestButton6 = "com.antutu.ABenchMark:id/start_test_text";
     private static int initialTimeoutSeconds = 20;
 
+    @Test
+    public void setup() throws Exception {
+        dismissAndroidVersionPopup();
+    }
+
     @Test
     public void runWorkload() throws Exception{
         hitTest();
diff --git a/wa/workloads/benchmarkpi/com.arm.wa.uiauto.benchmarkpi.apk b/wa/workloads/benchmarkpi/com.arm.wa.uiauto.benchmarkpi.apk
index 4ec83cc2..1cbc2bc1 100644
Binary files a/wa/workloads/benchmarkpi/com.arm.wa.uiauto.benchmarkpi.apk and b/wa/workloads/benchmarkpi/com.arm.wa.uiauto.benchmarkpi.apk differ
diff --git a/wa/workloads/benchmarkpi/uiauto/app/src/main/java/com/arm/wa/uiauto/benchmarkpi/UiAutomation.java b/wa/workloads/benchmarkpi/uiauto/app/src/main/java/com/arm/wa/uiauto/benchmarkpi/UiAutomation.java
index fd3bd111..996d49cd 100644
--- a/wa/workloads/benchmarkpi/uiauto/app/src/main/java/com/arm/wa/uiauto/benchmarkpi/UiAutomation.java
+++ b/wa/workloads/benchmarkpi/uiauto/app/src/main/java/com/arm/wa/uiauto/benchmarkpi/UiAutomation.java
@@ -36,6 +36,11 @@ public class UiAutomation extends BaseUiAutomation {
     public Bundle parameters;
     public String packageID;
 
+    @Test
+    public void setup() throws Exception {
+        dismissAndroidVersionPopup();
+    }
+
     @Test
     public void runWorkload() throws Exception {
         startTest();
diff --git a/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk b/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk
index 2aa9a9d8..389e6b43 100644
Binary files a/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk and b/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk differ
diff --git a/wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java b/wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java
index aad4be2d..ac9431fe 100644
--- a/wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java
+++ b/wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java
@@ -62,6 +62,7 @@ public class UiAutomation extends BaseUiAutomation {
     @Override
     public void setup() throws Exception {
         initialize_instrumentation();
+        dismissAndroidVersionPopup();
 
         if (!isCorporate)
             dismissEula();
diff --git a/wa/workloads/pcmark/com.arm.wa.uiauto.pcmark.apk b/wa/workloads/pcmark/com.arm.wa.uiauto.pcmark.apk
index 4d20fe7c..d600ed38 100644
Binary files a/wa/workloads/pcmark/com.arm.wa.uiauto.pcmark.apk and b/wa/workloads/pcmark/com.arm.wa.uiauto.pcmark.apk differ
diff --git a/wa/workloads/pcmark/uiauto/app/src/main/java/com/arm/wa/uiauto/pcmark/UiAutomation.java b/wa/workloads/pcmark/uiauto/app/src/main/java/com/arm/wa/uiauto/pcmark/UiAutomation.java
index ca2968e0..05b92a35 100755
--- a/wa/workloads/pcmark/uiauto/app/src/main/java/com/arm/wa/uiauto/pcmark/UiAutomation.java
+++ b/wa/workloads/pcmark/uiauto/app/src/main/java/com/arm/wa/uiauto/pcmark/UiAutomation.java
@@ -46,7 +46,7 @@ public class UiAutomation extends BaseUiAutomation {
 
     @Test
     public void setup() throws Exception{
-        dismissPopup();
+        dismissAndroidVersionPopup();
         setScreenOrientation(ScreenOrientation.NATURAL);
         loadBenchmarks();
         installBenchmark();
@@ -62,18 +62,6 @@ public class UiAutomation extends BaseUiAutomation {
         unsetScreenOrientation();
     }
 
-    // If we run the app in newer Android we'll get a popup complaining about
-    // that, silently accept it and carry on.
-    // This function should act as a NOP if no popup appears.
-    public void dismissPopup() throws Exception {
-        UiObject acceptButton =
-           mDevice.findObject(new UiSelector().resourceId("android:id/button1")
-                                         .className("android.widget.Button"));
-        if (acceptButton.waitForExists(WAIT_TIMEOUT_5SEC)) {
-            acceptButton.click();
-        }
-    }
-
     //Swipe to benchmarks and back to initialise the app correctly
     private void loadBenchmarks() throws Exception {
         UiObject title = 
diff --git a/wa/workloads/vellamo/com.arm.wa.uiauto.vellamo.apk b/wa/workloads/vellamo/com.arm.wa.uiauto.vellamo.apk
index 1aa330db..c0a2d75d 100644
Binary files a/wa/workloads/vellamo/com.arm.wa.uiauto.vellamo.apk and b/wa/workloads/vellamo/com.arm.wa.uiauto.vellamo.apk differ
diff --git a/wa/workloads/vellamo/uiauto/app/src/main/java/com/arm/wa/uiauto/vellamo/UiAutomation.java b/wa/workloads/vellamo/uiauto/app/src/main/java/com/arm/wa/uiauto/vellamo/UiAutomation.java
index 52baf4dd..673f92af 100644
--- a/wa/workloads/vellamo/uiauto/app/src/main/java/com/arm/wa/uiauto/vellamo/UiAutomation.java
+++ b/wa/workloads/vellamo/uiauto/app/src/main/java/com/arm/wa/uiauto/vellamo/UiAutomation.java
@@ -62,7 +62,7 @@ public class UiAutomation extends BaseUiAutomation {
 
     @Test
     public void setup() throws Exception {
-        dismissPopUp();
+        dismissAndroidVersionPopup();
         dismissEULA();
         if (version.equals("2.0.3")) {
             dissmissWelcomebanner();
@@ -307,14 +307,4 @@ public class UiAutomation extends BaseUiAutomation {
             noButton.click();
         }
     }
-
-    public void dismissPopUp() throws Exception {
-        UiSelector selector = new UiSelector();
-
-        UiObject okButton =
-           mDevice.findObject(selector.className("android.widget.Button").text("OK"));
-        if (okButton.exists()) {
-            okButton.click();
-        }
-    }
 }