diff --git a/validate/tools/launcher/apps/gstvalidate.py b/validate/tools/launcher/apps/gstvalidate.py
index 2324c06d29..daa43ed737 100644
--- a/validate/tools/launcher/apps/gstvalidate.py
+++ b/validate/tools/launcher/apps/gstvalidate.py
@@ -94,12 +94,9 @@ class GstValidateTranscodingTestsGenerator(GstValidateTestsGenerator):
                 continue
 
             for comb in self.test_manager.get_encoding_formats():
-                suffix = os.path.basename (mediainfo.media_descriptor.get_path())
-                suffix = suffix.replace (".media_info", "")
-                suffix = suffix.replace (".stream_info", "")
                 classname = "validate.%s.transcode.to_%s.%s" % (mediainfo.media_descriptor.get_protocol(),
                                                                 str(comb).replace(' ', '_'),
-                                                                suffix.replace('.', '_'))
+                                                                mediainfo.media_descriptor.get_clean_name())
                 self.add_test(GstValidateTranscodingTest(classname,
                                                          self.test_manager.options,
                                                          self.test_manager.reporter,
@@ -184,8 +181,7 @@ class GstValidatePlaybinTestsGenerator(GstValidatePipelineTestsGenerator):
 
                 fname = "%s.%s" % (self.get_fname(scenario,
                                    protocol),
-                                   os.path.basename(minfo.media_descriptor.get_path()).replace(".stream_info",
-                                       '').replace(".media_info", ''))
+                                   os.path.basename(minfo.media_descriptor.get_clean_name()))
                 self.debug("Adding: %s", fname)
 
                 if scenario.does_reverse_playback() and protocol == Protocols.HTTP:
diff --git a/validate/tools/launcher/baseclasses.py b/validate/tools/launcher/baseclasses.py
index 395451cab9..4069039f6b 100644
--- a/validate/tools/launcher/baseclasses.py
+++ b/validate/tools/launcher/baseclasses.py
@@ -1219,6 +1219,11 @@ class GstValidateMediaDescriptor(MediaDescriptor):
 
         return n
 
+    def get_clean_name(self):
+        name = os.path.basename(self.get_path())
+        name = re.sub("\.stream_info|\.media_info", "", name)
+
+        return name.replace('.', "_")
 
 class MediaFormatCombination(object):
     _FORMATS = {"aac": "audio/mpeg,mpegversion=4",