diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineManagerTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineManagerTest.kt
index 56f75e226..090086943 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineManagerTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineManagerTest.kt
@@ -37,14 +37,17 @@ class OfflineManagerTest : AppCenter() {
     @Before
     @After
     fun resetDatabase() {
+        val latch = CountDownLatch(1)
         OfflineManager.getInstance(context).resetDatabase(object : OfflineManager.FileSourceCallback {
             override fun onSuccess() {
+                latch.countDown()
             }
 
             override fun onError(message: String) {
                 throw IOException("Unable to reset database before / after tests.")
             }
         })
+        latch.await()
     }
 
     @Test(timeout = 30_000)
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTests.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTests.java
index 6e5dcd32c..0bc24525d 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTests.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTests.java
@@ -128,6 +128,7 @@ public class RuntimeStyleTests extends EspressoTest {
     });
   }
 
+  @Test
   public void testAddLayerAt() {
     validateTestSetup();
     onView(withId(R.id.mapView)).perform(new BaseViewAction() {