diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingFragmentScreenshot.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingFragmentScreenshot.kt
index 487b75b5490ad2dc5ad0c8be9cfbb4d540ebba30..bc641747b55d624fb823772bd37fdf6f08335376 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingFragmentScreenshot.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingFragmentScreenshot.kt
@@ -1,6 +1,10 @@
 package de.rki.coronawarnapp.ui.onboarding.screenshot
 
 import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.ui.onboarding.OnboardingFragment
@@ -44,7 +48,8 @@ class OnboardingFragmentScreenshot : BaseUITest() {
     @Test
     fun capture_screenshot() {
         launchFragmentInContainer<OnboardingFragment>(themeResId = R.style.AppTheme)
-        Thread.sleep(1000)
+        // Check any view to make sure screenshot is not blank
+        onView(withId(R.id.onboarding_button_next)).check(matches(isDisplayed()))
         Screengrab.screenshot(OnboardingFragment::class.simpleName)
     }
 }
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingNotificationsFragmentScreenshot.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingNotificationsFragmentScreenshot.kt
index aa4c1d665f91763391ce7c2efcc030e93b852429..ac4f72e7fb8f08be2f6af9cb76381c14df51c8a5 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingNotificationsFragmentScreenshot.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingNotificationsFragmentScreenshot.kt
@@ -1,6 +1,10 @@
 package de.rki.coronawarnapp.ui.onboarding.screenshot
 
 import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.ui.onboarding.OnboardingNotificationsFragment
@@ -44,8 +48,8 @@ class OnboardingNotificationsFragmentScreenshot : BaseUITest() {
     @Test
     fun capture_screenshot() {
         launchFragmentInContainer<OnboardingNotificationsFragment>(themeResId = R.style.AppTheme)
-            .onFragment {
-                Screengrab.screenshot(OnboardingNotificationsFragment::class.simpleName)
-            }
+        // Check any view to make sure screenshot is not blank
+        onView(withId(R.id.onboarding_button_next)).check(matches(isDisplayed()))
+        Screengrab.screenshot(OnboardingNotificationsFragment::class.simpleName)
     }
 }
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingPrivacyFragmentScreenshot.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingPrivacyFragmentScreenshot.kt
index eacd6e9550057414bf031959ba13e74e779bf9bc..a348f19adcfd32f1e205d82f842fb3b0037500de 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingPrivacyFragmentScreenshot.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingPrivacyFragmentScreenshot.kt
@@ -1,6 +1,10 @@
 package de.rki.coronawarnapp.ui.onboarding.screenshot
 
 import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.ui.onboarding.OnboardingPrivacyFragment
@@ -44,8 +48,8 @@ class OnboardingPrivacyFragmentScreenshot : BaseUITest() {
     @Test
     fun capture_screenshot() {
         launchFragmentInContainer<OnboardingPrivacyFragment>(themeResId = R.style.AppTheme)
-            .onFragment {
-                Screengrab.screenshot(OnboardingPrivacyFragment::class.simpleName)
-            }
+        // Check any view to make sure screenshot is not blank
+        onView(withId(R.id.onboarding_button_next)).check(matches(isDisplayed()))
+        Screengrab.screenshot(OnboardingPrivacyFragment::class.simpleName)
     }
 }
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingTestFragmentScreenshot.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingTestFragmentScreenshot.kt
index 8f2fb6932411f43e7bc1b8b66d38bb4fee05d9dc..c1a1a45c7d5ef8b1921103d123dd0c66379bd2b2 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingTestFragmentScreenshot.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingTestFragmentScreenshot.kt
@@ -1,6 +1,10 @@
 package de.rki.coronawarnapp.ui.onboarding.screenshot
 
 import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.ui.onboarding.OnboardingTestFragment
@@ -44,6 +48,8 @@ class OnboardingTestFragmentScreenshot : BaseUITest() {
     @Test
     fun capture_screenshot() {
         launchFragmentInContainer<OnboardingTestFragment>(themeResId = R.style.AppTheme)
+        // Check any view to make sure screenshot is not blank
+        onView(withId(R.id.onboarding_button_next)).check(matches(isDisplayed()))
         Screengrab.screenshot(OnboardingTestFragment::class.simpleName)
     }
 }
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingTracingFragmentScreenshot.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingTracingFragmentScreenshot.kt
index 4627130484807ffccd2de3aecc23bbcc0303ee7d..93fddcb3871aa63edcff3c56b2caa44b54a50841 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingTracingFragmentScreenshot.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/screenshot/OnboardingTracingFragmentScreenshot.kt
@@ -1,6 +1,10 @@
 package de.rki.coronawarnapp.ui.onboarding.screenshot
 
 import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.ui.onboarding.OnboardingTracingFragment
@@ -44,8 +48,8 @@ class OnboardingTracingFragmentScreenshot : BaseUITest() {
     @Test
     fun capture_screenshot() {
         launchFragmentInContainer<OnboardingTracingFragment>(themeResId = R.style.AppTheme)
-            .onFragment {
-                Screengrab.screenshot(OnboardingTracingFragment::class.simpleName)
-            }
+        // Check any view to make sure screenshot is not blank
+        onView(withId(R.id.onboarding_button_next)).check(matches(isDisplayed()))
+        Screengrab.screenshot(OnboardingTracingFragment::class.simpleName)
     }
 }