diff --git a/test/runner/lib/executor.py b/test/runner/lib/executor.py
index ec79bd45b12..c08cb174115 100644
--- a/test/runner/lib/executor.py
+++ b/test/runner/lib/executor.py
@@ -327,7 +327,7 @@ def network_inventory(remotes):
 
         groups[remote.platform].append(
             '%s %s' % (
-                remote.name.replace('.', '_'),
+                remote.name.replace('.', '-'),
                 ' '.join('%s="%s"' % (k, options[k]) for k in sorted(options)),
             )
         )
diff --git a/test/runner/lib/manage_ci.py b/test/runner/lib/manage_ci.py
index f3e58689f64..b36d244b0b3 100644
--- a/test/runner/lib/manage_ci.py
+++ b/test/runner/lib/manage_ci.py
@@ -78,7 +78,7 @@ class ManageNetworkCI(object):
             'ansible_ssh_private_key_file=%s' % self.core_ci.ssh_key.key,
         ]
 
-        name = '%s-%s' % (self.core_ci.platform, self.core_ci.version.replace('.', '_'))
+        name = '%s-%s' % (self.core_ci.platform, self.core_ci.version.replace('.', '-'))
 
         env = ansible_environment(self.core_ci.args)
         cmd = [