diff --git a/containers/flatpak/test/test-ssh b/containers/flatpak/test/test-ssh
index 93425f8d81f7..82fa52b8e674 100755
--- a/containers/flatpak/test/test-ssh
+++ b/containers/flatpak/test/test-ssh
@@ -49,11 +49,13 @@ wait $CLIENT_PID
 
 rm cockpit-client-test-*-*-*
 
+echo 'XXXXX phase 1 done'
+
 # Check if we can start via pure DBus activation
 test ! -f cockpit-client-test-"${USER}"-cockpit-client-test-22
 gapplication action "${FLATPAK_ID}" open-path '"=cockpit-client-test"'
 until test -f cockpit-client-test-"${USER}"-cockpit-client-test-22; do sleep 0.5; done
 
-gapplication action "${FLATPAK_ID}" quit
+gapplication action "${FLATPAK_ID}" quit || true
 while flatpak ps | grep org.cockpit_project.CockpitClient; do sleep 1; done
 rm cockpit-client-test-*-*-*