diff --git a/.woodpecker/integration-test.yml b/.woodpecker/integration-test.yml
index e970dc83ef..ba9bec95a5 100644
--- a/.woodpecker/integration-test.yml
+++ b/.woodpecker/integration-test.yml
@@ -20,7 +20,7 @@ steps:
       - java -jar adbserver-desktop.jar &
       - sleep 3
       - adb logcat -c
-      - trap 'adb logcat -d -s RetryRule:W | tee retries.log' EXIT; ./gradlew :opencloudApp:connectedOriginalDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=eu.opencloud.android.IntegrationTest -Pandroid.testInstrumentationRunnerArguments.retries=1 --console=plain
+      - trap 'rc=$$?; adb logcat -d -s RetryRule:W | tee retries.log; if [ $$rc -ne 0 ]; then echo "--- full logcat ---"; adb logcat -d -v threadtime; fi' EXIT; ./gradlew :opencloudApp:connectedOriginalDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=eu.opencloud.android.IntegrationTest -Pandroid.testInstrumentationRunnerArguments.retries=1 --console=plain
 
   - name: instrumented data tests
     image: *android_image
diff --git a/opencloudApp/src/integrationTest/java/eu/opencloud/android/LoginTest.kt b/opencloudApp/src/integrationTest/java/eu/opencloud/android/LoginTest.kt
index 5b38bc932b..b7bc7349ff 100644
--- a/opencloudApp/src/integrationTest/java/eu/opencloud/android/LoginTest.kt
+++ b/opencloudApp/src/integrationTest/java/eu/opencloud/android/LoginTest.kt
@@ -70,7 +70,9 @@ class LoginTest : TestCase(
             }
             step("check personal space") {
                 MainScreen {
-                    avatarButton.isVisible()
+                    flakySafely(timeoutMs = ACCOUNT_DISCOVERY_TIMEOUT_MS) {
+                        avatarButton.isVisible()
+                    }
                     avatarButton.isClickable()
                     avatarButton.click()
                 }
@@ -87,4 +89,8 @@ class LoginTest : TestCase(
             }
         }
     }
+
+    companion object {
+        private const val ACCOUNT_DISCOVERY_TIMEOUT_MS = 60_000L
+    }
 }