diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle
index fb08f95f..32f543fe 100644
--- a/android_app/app/build.gradle
+++ b/android_app/app/build.gradle
@@ -61,8 +61,8 @@ dependencies {
     testImplementation 'junit:junit:4.12'
 
     // Instrumented unit tests
-    androidTestImplementation 'androidx.annotation:annotation:1.0.1'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.annotation:annotation:1.0.0'
+    androidTestImplementation "androidx.test.ext:junit:1.1.0"
     androidTestImplementation 'androidx.test:rules:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.1'
diff --git a/android_app/app/src/androidTest/java/com/health/openscale/DatabaseMigrationTest.java b/android_app/app/src/androidTest/java/com/health/openscale/DatabaseMigrationTest.java
index e8be801d..5d7f052a 100644
--- a/android_app/app/src/androidTest/java/com/health/openscale/DatabaseMigrationTest.java
+++ b/android_app/app/src/androidTest/java/com/health/openscale/DatabaseMigrationTest.java
@@ -23,7 +23,7 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.health.openscale.core.database.AppDatabase;
 
diff --git a/android_app/app/src/androidTest/java/com/health/openscale/DatabaseTest.java b/android_app/app/src/androidTest/java/com/health/openscale/DatabaseTest.java
index b5c892ef..4019274b 100644
--- a/android_app/app/src/androidTest/java/com/health/openscale/DatabaseTest.java
+++ b/android_app/app/src/androidTest/java/com/health/openscale/DatabaseTest.java
@@ -18,7 +18,7 @@ package com.health.openscale;
 import androidx.room.Room;
 import android.content.Context;
 import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.health.openscale.core.database.AppDatabase;
 import com.health.openscale.core.database.ScaleMeasurementDAO;
diff --git a/android_app/app/src/androidTest/java/com/health/openscale/gui/AddMeasurementTest.java b/android_app/app/src/androidTest/java/com/health/openscale/gui/AddMeasurementTest.java
index 150c2a91..8d2f2110 100644
--- a/android_app/app/src/androidTest/java/com/health/openscale/gui/AddMeasurementTest.java
+++ b/android_app/app/src/androidTest/java/com/health/openscale/gui/AddMeasurementTest.java
@@ -20,8 +20,8 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import androidx.test.InstrumentationRegistry;
 import androidx.test.espresso.contrib.PickerActions;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import android.widget.DatePicker;
 import android.widget.EditText;
diff --git a/android_app/app/src/androidTest/java/com/health/openscale/gui/AddUserTest.java b/android_app/app/src/androidTest/java/com/health/openscale/gui/AddUserTest.java
index dd6c30d7..e3342d49 100644
--- a/android_app/app/src/androidTest/java/com/health/openscale/gui/AddUserTest.java
+++ b/android_app/app/src/androidTest/java/com/health/openscale/gui/AddUserTest.java
@@ -21,8 +21,8 @@ import android.preference.PreferenceManager;
 import androidx.test.InstrumentationRegistry;
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.contrib.PickerActions;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java b/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java
index 1799c358..b3167096 100644
--- a/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java
+++ b/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java
@@ -21,9 +21,9 @@ import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.preference.PreferenceManager;
 import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.rule.GrantPermissionRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.test.runner.screenshot.BasicScreenCaptureProcessor;
 import androidx.test.runner.screenshot.ScreenCapture;
 import androidx.test.runner.screenshot.Screenshot;