8 files changed, 7 insertions, 3 deletions

diff --git a/render-test/android-manifest-probe-memory.json b/render-test/android-manifest-probe-memory.json
index a3562088f4..4a48bc80a9 100644
--- a/render-test/android-manifest-probe-memory.json
+++ b/render-test/android-manifest-probe-memory.json
@@ -1,6 +1,6 @@
 {
     "base_test_path":"mapbox-gl-js/test/integration",
-    "expectation_paths":["render-test/expected"],
+    "expectation_paths":["render-test/expected", "render-test/expected/android"],
     "ignore_paths":["ignores/ignores.json", "ignores/linux-ignores.json"],
     "vendor_path":"vendor",
     "asset_path": "mapbox-gl-js/test/integration",
diff --git a/render-test/android-manifest-probe-network-gfx.json b/render-test/android-manifest-probe-network-gfx.json
index b16424d999..e8300a036c 100644
--- a/render-test/android-manifest-probe-network-gfx.json
+++ b/render-test/android-manifest-probe-network-gfx.json
@@ -1,6 +1,6 @@
 {
     "base_test_path":"mapbox-gl-js/test/integration",
-    "expectation_paths":["render-test/expected"],
+    "expectation_paths":["render-test/expected", "render-test/expected/android"],
     "ignore_paths":["ignores/ignores.json", "ignores/linux-ignores.json"],
     "vendor_path":"vendor",
     "asset_path": "mapbox-gl-js/test/integration",
diff --git a/render-test/android/app/src/androidTest/java/android/app/NativeActivityTest.java b/render-test/android/app/src/androidTest/java/android/app/NativeActivityTest.java
index 3d8c333902..d508a9d5a4 100644
--- a/render-test/android/app/src/androidTest/java/android/app/NativeActivityTest.java
+++ b/render-test/android/app/src/androidTest/java/android/app/NativeActivityTest.java
@@ -6,6 +6,7 @@ import androidx.test.rule.ActivityTestRule;
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.Assert;
 import org.junit.runner.RunWith;
 import android.util.Log;
 
@@ -24,6 +25,8 @@ public class NativeActivityTest {
             Log.v("Test", "Test is running");
             Thread.sleep(1000L);
         }
-        Log.v("Test", "End the test");
+        Log.v("Test", "All render tests are finished!");
+        Assert.assertTrue("All test cases are passed", TestState.testResult);
+
     }
 }
\ No newline at end of file
diff --git a/render-test/android/app/src/androidTest/java/android/app/TestState.java b/render-test/android/app/src/androidTest/java/android/app/TestState.java
index 44a0653fb6..b374a72afe 100644
--- a/render-test/android/app/src/androidTest/java/android/app/TestState.java
+++ b/render-test/android/app/src/androidTest/java/android/app/TestState.java
@@ -2,4 +2,5 @@ package android.app;
 
 public class TestState {
     static boolean running = true;
+    static boolean testResult = true;
 }
\ No newline at end of file
diff --git a/render-test/expected/android/render-tests/sprites/1x-screen-1x-icon/expected.png b/render-test/expected/android/render-tests/sprites/1x-screen-1x-icon/expected.png
deleted file mode 100644
index 8a5a9652a7..0000000000
--- a/render-test/expected/android/render-tests/sprites/1x-screen-1x-icon/expected.png
+++ /dev/null
diff --git a/render-test/expected/android/render-tests/sprites/1x-screen-2x-icon/expected.png b/render-test/expected/android/render-tests/sprites/1x-screen-2x-icon/expected.png
deleted file mode 100644
index 235f5170f3..0000000000
--- a/render-test/expected/android/render-tests/sprites/1x-screen-2x-icon/expected.png
+++ /dev/null
diff --git a/render-test/expected/android/render-tests/sprites/2x-screen-1x-icon/expected.png b/render-test/expected/android/render-tests/sprites/2x-screen-1x-icon/expected.png
deleted file mode 100644
index 6fd28edf16..0000000000
--- a/render-test/expected/android/render-tests/sprites/2x-screen-1x-icon/expected.png
+++ /dev/null
diff --git a/render-test/expected/android/render-tests/sprites/2x-screen-2x-icon/expected.png b/render-test/expected/android/render-tests/sprites/2x-screen-2x-icon/expected.png
deleted file mode 100644
index 7ef7af0ab4..0000000000
--- a/render-test/expected/android/render-tests/sprites/2x-screen-2x-icon/expected.png
+++ /dev/null