diff --git a/build.gradle b/build.gradle
index b6f7bc4f74b7..7e2ee6398b94 100644
--- a/build.gradle
+++ b/build.gradle
@@ -151,7 +151,7 @@ android {
 
         buildTypes {
             debug {
-                testCoverageEnabled (project.hasProperty('coverage'))
+                testCoverageEnabled true
             }
         }
 
@@ -184,6 +184,7 @@ android {
 
         testOptions {
             unitTests.returnDefaultValues = true
+            execution 'ANDROIDX_TEST_ORCHESTRATOR'
         }
     }
 
@@ -358,6 +359,7 @@ dependencies {
     androidTestImplementation 'androidx.test:rules:1.2.0'
     // Android JUnit Runner
     androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestUtil 'androidx.test:orchestrator:1.1.0'
 
     // Espresso core
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
diff --git a/src/androidTest/java/com/owncloud/android/ScreenshotsIT.java b/src/androidTest/java/com/owncloud/android/ScreenshotsIT.java
index ace04e9e1e06..53d61c032ade 100644
--- a/src/androidTest/java/com/owncloud/android/ScreenshotsIT.java
+++ b/src/androidTest/java/com/owncloud/android/ScreenshotsIT.java
@@ -32,6 +32,7 @@
 import static androidx.test.espresso.Espresso.onData;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.swipeUp;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.core.AnyOf.anyOf;
@@ -133,6 +134,7 @@ public void autoUploadScreenshot() {
         ActivityScenario.launch(FileDisplayActivity.class);
 
         onView(withId(R.id.drawer_layout)).perform(DrawerActions.open());
+        onView(withId(R.id.nav_view)).perform(swipeUp());
         onView(anyOf(withText(R.string.drawer_synced_folders), withId(R.id.nav_synced_folders))).perform(click());
 
         Screengrab.screenshot("05_autoUpload");