diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/BaseTest.java b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/BaseTest.java
index 038cc3099..60ac10f14 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/BaseTest.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/BaseTest.java
@@ -37,23 +37,22 @@ public class BaseTest
 
     @Override
     protected void tearDown() throws Exception {
-        if (!screenshotOnTearDown) {
-            return;
-        }
-
-        try {
-            // Screenshots should be taken on the UI thread
-            runTestOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    ScreenshotUtil.take(getActivity(), null);
-                }
-            });
-        } catch (Throwable throwable) {
-            throwable.printStackTrace();
+        if (screenshotOnTearDown) {
+            try {
+                // Screenshots should be taken on the UI thread
+                runTestOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        ScreenshotUtil.take(getActivity(), null);
+                    }
+                });
+            } catch (Throwable throwable) {
+                throwable.printStackTrace();
+            }
         }
 
         super.tearDown();
+        mActivity = null;
     }
 
     protected void takeNamedScreenshot(final String name) {