diff --git a/tests/lib/installed-state.sh b/tests/lib/installed-state.sh
index f783a551..ce26da22 100644
--- a/tests/lib/installed-state.sh
+++ b/tests/lib/installed-state.sh
@@ -78,7 +78,7 @@ installed_state_compare() {
     local compare_type="all"
     
     source "$s2/info.txt"
-    if grep "mailinabox-ldap.git" <<<"$GIT_ORIGIN" >/dev/null; then
+    if [ -z "$GIT_ORIGIN" ] || grep "mailinabox-ldap.git" <<<"$GIT_ORIGIN" >/dev/null; then
         GIT_ORIGIN=""
         source "$s1/info.txt"
         if ! grep "mailinabox-ldap.git" <<<"$GIT_ORIGIN" >/dev/null; then
diff --git a/tests/system-setup/upgrade-from-upstream.sh b/tests/system-setup/upgrade-from-upstream.sh
index ed4713a0..b528198f 100755
--- a/tests/system-setup/upgrade-from-upstream.sh
+++ b/tests/system-setup/upgrade-from-upstream.sh
@@ -165,6 +165,8 @@ installed_state_capture "/tmp/state/miab-ldap"
 
 # compare states
 if ! installed_state_compare "/tmp/state/upstream" "/tmp/state/miab-ldap"; then
+    dump_file "/tmp/state/upstream/info.txt"
+    dump_file "/tmp/state/miab-ldap/info.txt"
     die "Upstream and upgraded states are different !"
 fi