diff --git a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
index 0b7341d13..071609401 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
@@ -5,6 +5,8 @@ import android.app.ActivityManager;
 import android.app.Instrumentation;
 import android.content.Context;
 import android.os.Build;
+
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.espresso.IdlingPolicies;
 import androidx.test.espresso.ViewInteraction;
@@ -88,7 +90,7 @@ public class MainActivityEspressoTest {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        SystemAnimations.disableAll(InstrumentationRegistry.getTargetContext());
+        SystemAnimations.disableAll(ApplicationProvider.getApplicationContext());
 
         // dismiss the ANR or any other system dialogs that might be there
         UiObject button = new UiObject(new UiSelector().text("Wait").enabled(true));
@@ -109,7 +111,7 @@ public class MainActivityEspressoTest {
 
     @AfterClass
     public static void classTearDown() {
-        SystemAnimations.enableAll(InstrumentationRegistry.getTargetContext());
+        SystemAnimations.enableAll(ApplicationProvider.getApplicationContext());
     }
 
     public static boolean isEmulator() {
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java b/app/src/androidTest/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java
index f44d6b799..9f0b6fe75 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java
@@ -1,6 +1,8 @@
 package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.fdroid.fdroid.FDroidApp;
@@ -23,7 +25,7 @@ public class BonjourManagerTest {
 
     @Test
     public void testStartStop() throws InterruptedException {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
 
         FDroidApp.ipAddressString = LOCALHOST;
         FDroidApp.port = PORT;
@@ -65,7 +67,7 @@ public class BonjourManagerTest {
 
     @Test
     public void testRestart() throws InterruptedException {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
 
         FDroidApp.ipAddressString = LOCALHOST;
         FDroidApp.port = PORT;
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java b/app/src/androidTest/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
index c43ee0155..df3dbe7e7 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
@@ -4,6 +4,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -41,7 +43,7 @@ public class LocalHTTPDManagerTest {
 
     @Before
     public void setUp() {
-        context = InstrumentationRegistry.getTargetContext();
+        context = ApplicationProvider.getApplicationContext();
         lbm = LocalBroadcastManager.getInstance(context);
 
         FDroidApp.ipAddressString = LOCALHOST;