diff --git a/validate/tools/launcher/apps/Makefile.am b/validate/tools/launcher/apps/Makefile.am
index f5ed98be5f..db0fc8b06a 100644
--- a/validate/tools/launcher/apps/Makefile.am
+++ b/validate/tools/launcher/apps/Makefile.am
@@ -3,5 +3,5 @@ appsdir = $(libdir)/gst-validate-launcher/python/launcher/apps/
 SUBDIRS = validate
 
 apps_PYTHON = \
-	ges-launch.py \
-	gst-validate.py
+	geslaunch.py \
+	gstvalidate.py
diff --git a/validate/tools/launcher/apps/ges-launch.py b/validate/tools/launcher/apps/geslaunch.py
similarity index 99%
rename from validate/tools/launcher/apps/ges-launch.py
rename to validate/tools/launcher/apps/geslaunch.py
index 3606bbc7ec..d9620371f7 100644
--- a/validate/tools/launcher/apps/ges-launch.py
+++ b/validate/tools/launcher/apps/geslaunch.py
@@ -24,7 +24,8 @@ import subprocess
 import utils
 from urllib import unquote
 import xml.etree.ElementTree as ET
-from baseclasses import GstValidateTest, TestsManager, ScenarioManager, MediaFormatCombination
+from baseclasses import GstValidateTest, TestsManager, ScenarioManager, MediaFormatCombination, \
+    MediaDescriptor, GstValidateEncodingTestInterface
 
 GES_DURATION_TOLERANCE = utils.GST_SECOND / 2
 
diff --git a/validate/tools/launcher/apps/gst-validate.py b/validate/tools/launcher/apps/gstvalidate.py
similarity index 99%
rename from validate/tools/launcher/apps/gst-validate.py
rename to validate/tools/launcher/apps/gstvalidate.py
index 47a794b939..2324c06d29 100644
--- a/validate/tools/launcher/apps/gst-validate.py
+++ b/validate/tools/launcher/apps/gstvalidate.py
@@ -17,6 +17,7 @@
 # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 import os
+import sys
 import time
 import urlparse
 import subprocess
@@ -25,7 +26,8 @@ from loggable import Loggable
 
 from baseclasses import GstValidateTest, TestsManager, Test, \
     ScenarioManager, NamedDic, GstValidateTestsGenerator, \
-    GstValidateMediaDescriptor
+    GstValidateMediaDescriptor, GstValidateEncodingTestInterface, \
+    GstValidateBaseTestManager
 
 from utils import path2url, DEFAULT_TIMEOUT, which, \
     GST_SECOND, Result, Protocols