diff --git a/screenshots/gplay/debug/com.nextcloud.client.FileDisplayActivityIT_open.png b/screenshots/gplay/debug/com.nextcloud.client.FileDisplayActivityIT_open.png
index c8142569ca..83c89fb047 100644
Binary files a/screenshots/gplay/debug/com.nextcloud.client.FileDisplayActivityIT_open.png and b/screenshots/gplay/debug/com.nextcloud.client.FileDisplayActivityIT_open.png differ
diff --git a/scripts/androidScreenshotTest b/scripts/androidScreenshotTest
index 4cb2ef515f..b4810b1137 100755
--- a/scripts/androidScreenshotTest
+++ b/scripts/androidScreenshotTest
@@ -3,8 +3,8 @@
 if [ $# -lt 2 ]; then
     echo "1: record: true/false
 2: class name
-3: method name" 
-    
+3: method name"
+
     exit
 fi
 
@@ -20,7 +20,7 @@ cd ../../../
 
 if [ $1 == "true" ] ; then
     record="-Precord"
-else 
+else
     record=""
 fi
 
@@ -30,6 +30,8 @@ else
     method="#$3"
 fi
 
-./gradlew gplayDebugExecuteScreenshotTests $record -Pandroid.testInstrumentationRunnerArguments.class=$class$method
+./gradlew gplayDebugExecuteScreenshotTests $record \
+-Pandroid.testInstrumentationRunnerArguments.annotation=com.owncloud.android.utils.ScreenshotTest \
+-Pandroid.testInstrumentationRunnerArguments.class=$class$method
 
 sed -i s'#<bool name="is_beta">true</bool>#<bool name="is_beta">false</bool>#'g src/main/res/values/setup.xml
diff --git a/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java b/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java
index 4dc39223fc..a2ae9b0112 100644
--- a/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java
+++ b/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java
@@ -68,9 +68,10 @@ public class FileDisplayActivityIT extends AbstractIT {
     @Test
     @ScreenshotTest
     public void open() {
-        Activity sut = activityRule.launchActivity(null);
+        FileDisplayActivity sut = activityRule.launchActivity(null);
 
-        shortSleep();
+        sut.getListOfFilesFragment().setFabEnabled(false);
+        sut.getListOfFilesFragment().setEmptyListLoadingMessage();
 
         Screenshot.snapActivity(sut).record();
     }
@@ -82,9 +83,8 @@ public class FileDisplayActivityIT extends AbstractIT {
 
         onView(withId(R.id.drawer_layout)).perform(DrawerActions.open());
 
-        waitForIdleSync();
-        shortSleep();
         sut.getListOfFilesFragment().setFabEnabled(false);
+        sut.getListOfFilesFragment().setEmptyListLoadingMessage();
 
         Screenshot.snapActivity(sut).record();
     }