diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40bab7b8d3138334a5e2aa496ea7365de8fcda93..f9f551e467d6594125b92330309a149f58e3e7d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,10 @@
 stages:  
-  - test
+  - test:scripts
+  - test:streaming_sim
+  - test:telegraf_agents
   
 test:scripts:
-  stage: test
+  stage: test:scripts
   before_script:
     - vagrant --fixture=scripts -- destroy --force 
   script: 
@@ -13,7 +15,7 @@ test:scripts:
   when: manual
   
 test:streaming_sim:
-  stage: test
+  stage: test:streaming_sim
   before_script:
     - vagrant --fixture=streaming-sim -- destroy --force    
   script: 
@@ -21,12 +23,10 @@ test:streaming_sim:
     - vagrant --fixture=streaming-sim -- ssh test-runner -- -tt "cd /vagrant && pytest test/streaming-sim/"
   after_script:
     - vagrant --fixture=streaming-sim -- destroy --force  
-  dependencies:
-    - test:streaming_sim     
   when: manual  
   
 test:telegraf_agents:
-  stage: test
+  stage: test:telegraf_agents
   before_script:
     - vagrant --fixture=telegraf-agents -- destroy --force      
   script: 
@@ -34,8 +34,6 @@ 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