diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 593a3b8..4e0d0c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,8 @@ Test:
   interruptible: yes
   stage: test
   script:
-    - ansible-playbook --skip-tags no-test -C site.yml --vault-password-file /vaultpw
+    - ansible-playbook --skip-tags no-test -C site.yml --vault-password-file /vaultpw || error="$?"
+    - [ -n "$error" ] && echo "Return code $error" && false
 
 Play_Against_Pis:
   stage: play
@@ -61,10 +62,8 @@ Play_Against_Pis:
 Play_Against_Desktops:
   stage: play
   script:
-    - ansible-playbook -l desktop site.yml --vault-password-file /vaultpw
-    - error="$?"
-    - echo "Return code $error"
-
+    - ansible-playbook -l desktop site.yml --vault-password-file /vaultpw || error="$?"
+    - [ -n "$error" ] && echo "Return code $error" && false
 Play_Against_Production:
   stage: play
   script: