1 files changed, 16 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java
index 5003793998..415953d747 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java
@@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk;
 
 import android.content.Context;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -68,6 +69,11 @@ public class MapboxTest {
     assertFalse(Mapbox.isAccessTokenValid("blabla"));
   }
 
+  @After
+  public void after() {
+    clearMapboxSingleton();
+  }
+
   private void injectMapboxSingleton(String accessToken) {
     Mapbox mapbox = new Mapbox(context, accessToken);
     try {
@@ -78,4 +84,14 @@ public class MapboxTest {
       throw new AssertionError();
     }
   }
+
+  private void clearMapboxSingleton() {
+    try {
+      Field field = Mapbox.class.getDeclaredField("INSTANCE");
+      field.setAccessible(true);
+      field.set(field, null);
+    } catch (Exception exception) {
+      throw new AssertionError();
+    }
+  }
 }