diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08424778a077327980c6604a660dffa5da30b1d7..73e26d4d8f0c04e95304a6f6805b9f365d266752 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:  
   - test
 
-test_scripts:
+test:scripts:
   stage: test
   before_script:
     - vagrant --fixture=scripts -- destroy --force 
@@ -12,7 +12,7 @@ test_scripts:
     - vagrant --fixture=scripts -- destroy --force       
   when: manual
   
-test_streaming_sim:
+test:streaming_sim:
   stage: test
   before_script:
     - vagrant --fixture=streaming-sim -- destroy --force    
@@ -23,13 +23,13 @@ test_streaming_sim:
     - vagrant --fixture=streaming-sim -- destroy --force   
   when: manual  
   
-test_telegraf_agents:
+test:telegraf_agents:
   stage: test
   before_script:
     - vagrant --fixture=telegraf-agents -- destroy --force      
   script: 
     - vagrant --fixture=telegraf-agents -- up
-    - vagrant --fixture=telegraf-agents -- ssh clmc-service -- -tt "cd /vagrant && pytest 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       
   when: manual