diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 251d23b68eea65da78752d77ac4d4a5dd87f73b5..b265caa85a4a80314031db56eec17b77fb0dd5c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build:tests:
     - build/clmctest-SNAPSHOT.tar.gz
     expire_in: 1 day
 
-test:
+test:all:
   stage: test
   dependencies: 
     - build:tests
@@ -28,8 +28,10 @@ test:
 
 clean:
   stage: clean
+  depends:
+    - test:all
   script: 
     - vagrant --fixture=inputs -- destroy --force     
     - vagrant --fixture=monitoring -- destroy --force     
     - vagrant --fixture=scripts -- destroy --force
-  when: on_failure
+  when: always