diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c30fd29feacbfffca292ee523e9514d470606a83..40bab7b8d3138334a5e2aa496ea7365de8fcda93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,32 +1,32 @@
 stages:  
-  - test:scripts
-  - test:streaming_sim
-  - test:telegraf_agents
+  - test
   
 test:scripts:
-  stage: test:scripts
+  stage: test
   before_script:
     - vagrant --fixture=scripts -- destroy --force 
   script: 
     - vagrant --fixture=scripts -- up
     - vagrant --fixture=scripts -- ssh test-runner -- -tt "cd /vagrant && pytest test/scripts/"
   after_script:
-    - vagrant --fixture=scripts -- destroy --force       
+    - vagrant --fixture=scripts -- destroy --force
   when: manual
   
 test:streaming_sim:
-  stage: test:streaming_sim
+  stage: test
   before_script:
     - vagrant --fixture=streaming-sim -- destroy --force    
   script: 
     - vagrant --fixture=streaming-sim -- up
     - vagrant --fixture=streaming-sim -- ssh test-runner -- -tt "cd /vagrant && pytest test/streaming-sim/"
   after_script:
-    - vagrant --fixture=streaming-sim -- destroy --force   
+    - vagrant --fixture=streaming-sim -- destroy --force  
+  dependencies:
+    - test:streaming_sim     
   when: manual  
   
 test:telegraf_agents:
-  stage: test:telegraf_agents
+  stage: test
   before_script:
     - vagrant --fixture=telegraf-agents -- destroy --force      
   script: 
@@ -34,6 +34,8 @@ test:telegraf_agents:
     - vagrant --fixture=telegraf-agents -- ssh test-runner -- -tt "cd /vagrant && pytest test/telegraf-agents/"
   after_script:
     - vagrant --fixture=telegraf-agents -- destroy --force       
+  dependencies:
+    - test:streaming_sim    
   when: manual