diff --git a/tests/deep-clean.sh b/tests/deep-clean.sh
index 4da3fe055edcb69c681966d0627e0dd60bdcf9e3..be59469d302bc0d2de2267a4e3d8c78e33dd1b09 100755
--- a/tests/deep-clean.sh
+++ b/tests/deep-clean.sh
@@ -1,7 +1,8 @@
 #!/bin/bash -eux
 
 image=$1
+BACKUP_DESTINATION=`cat /data/BACKUP_DESTINATION`
 
 /data/indiehosters/tests/clean-image.sh $image
 
-ssh core@backup.dev "rm -rf $image.test"
+ssh $BACKUP_DESTINATION "rm -rf $image.test"
diff --git a/tests/finish.sh b/tests/finish.sh
index 9e776d9f6f913b5227dab701a333df2993759159..245b60dff67edc5bae9f5a2c00ddce4155cb5d0b 100755
--- a/tests/finish.sh
+++ b/tests/finish.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -eux
 
-systemctl list-units | grep failed
+systemctl list-units | grep -c failed | grep 0
 
 applications=( static static-git wordpress known)