diff --git a/scripts/b2g_emulator_unittest.py b/scripts/b2g_emulator_unittest.py
index c0869212..c0a8dcc5 100755
--- a/scripts/b2g_emulator_unittest.py
+++ b/scripts/b2g_emulator_unittest.py
@@ -109,18 +109,9 @@ class B2GEmulatorTest(TestingMixin, TooltoolMixin, EmulatorMixin, BaseScript):
         {'regex': re.compile(r'''(Timeout|NoSuchAttribute|Javascript|NoSuchElement|XPathLookup|NoSuchWindow|StaleElement|ScriptTimeout|ElementNotVisible|NoSuchFrame|InvalidElementState|NoAlertPresent|InvalidCookieDomain|UnableToSetCookie|InvalidSelector|MoveTargetOutOfBounds)Exception'''), 'level': ERROR},
     ]
 
-    mozbase_dir = os.path.join('tests', 'mozbase')
     virtualenv_modules = [
-        { 'manifestparser': os.path.join(mozbase_dir, 'manifestdestiny') },
-        { 'mozfile': os.path.join(mozbase_dir, 'mozfile') },
-        { 'mozhttpd': os.path.join(mozbase_dir, 'mozhttpd') },
-        { 'mozinfo': os.path.join(mozbase_dir, 'mozinfo') },
-        { 'mozinstall': os.path.join(mozbase_dir, 'mozinstall') },
-        { 'mozprofile': os.path.join(mozbase_dir, 'mozprofile') },
-        { 'mozprocess': os.path.join(mozbase_dir, 'mozprocess') },
-        { 'mozrunner': os.path.join(mozbase_dir, 'mozrunner') },
-        { 'mozdevice': os.path.join(mozbase_dir, 'mozdevice') },
-        { 'marionette': os.path.join('tests', 'marionette') },
+        'mozinstall',
+        {'marionette': os.path.join('tests', 'marionette')}
     ]
 
     def __init__(self, require_config_file=False):
diff --git a/scripts/b2g_panda.py b/scripts/b2g_panda.py
index 972be727..391ce945 100755
--- a/scripts/b2g_panda.py
+++ b/scripts/b2g_panda.py
@@ -50,15 +50,7 @@ class PandaTest(TestingMixin, BaseScript, VirtualenvMixin, MozpoolMixin, Buildbo
     mozbase_dir = os.path.join('tests', 'mozbase')
     virtualenv_modules = [
         'requests',
-        { 'manifestparser': os.path.join(mozbase_dir, 'manifestdestiny') },
-        { 'mozhttpd': os.path.join(mozbase_dir, 'mozhttpd') },
-        { 'mozinfo': os.path.join(mozbase_dir, 'mozinfo') },
-        { 'mozfile': os.path.join(mozbase_dir, 'mozfile') },
-        { 'mozinstall': os.path.join(mozbase_dir, 'mozinstall') },
-        { 'mozprofile': os.path.join(mozbase_dir, 'mozprofile') },
-        { 'mozprocess': os.path.join(mozbase_dir, 'mozprocess') },
-        { 'mozrunner': os.path.join(mozbase_dir, 'mozrunner') },
-        { 'mozdevice': os.path.join(mozbase_dir, 'mozdevice') },
+        'mozinstall',
         { 'marionette': os.path.join('tests', 'marionette/client') },
         { 'gaiatest': os.path.join('tests', 'gaiatest') },
     ]
diff --git a/scripts/marionette.py b/scripts/marionette.py
index f587a195..5e1d225b 100755
--- a/scripts/marionette.py
+++ b/scripts/marionette.py
@@ -77,17 +77,9 @@ class MarionetteTest(TestingMixin, TooltoolMixin, EmulatorMixin, BaseScript):
         {'regex': re.compile(r'''(Timeout|NoSuchAttribute|Javascript|NoSuchElement|XPathLookup|NoSuchWindow|StaleElement|ScriptTimeout|ElementNotVisible|NoSuchFrame|InvalidElementState|NoAlertPresent|InvalidCookieDomain|UnableToSetCookie|InvalidSelector|MoveTargetOutOfBounds)Exception'''), 'level': ERROR},
     ]
 
-    mozbase_dir = os.path.join('tests', 'mozbase')
     virtualenv_modules = [
-        { 'manifestparser': os.path.join(mozbase_dir, 'manifestdestiny') },
-        { 'mozhttpd': os.path.join(mozbase_dir, 'mozhttpd') },
-        { 'mozinfo': os.path.join(mozbase_dir, 'mozinfo') },
-        { 'mozfile': os.path.join(mozbase_dir, 'mozfile') },
-        { 'mozinstall': os.path.join(mozbase_dir, 'mozinstall') },
-        { 'mozprofile': os.path.join(mozbase_dir, 'mozprofile') },
-        { 'mozprocess': os.path.join(mozbase_dir, 'mozprocess') },
-        { 'mozrunner': os.path.join(mozbase_dir, 'mozrunner') },
-        { 'mozdevice': os.path.join(mozbase_dir, 'mozdevice') },
+        'mozinstall',
+        {'marionette': os.path.join('tests', 'marionette')}
     ]
 
     def __init__(self, require_config_file=False):