diff -ruN mozilla-release~/build/automation.py.in mozilla-release/build/automation.py.in
--- mozilla-release~/build/automation.py.in	2013-12-05 18:07:23.000000000 +0200
+++ mozilla-release/build/automation.py.in	2013-12-13 20:47:26.054464459 +0200
@@ -29,7 +29,7 @@
 # TODO: this is a hack for mozbase without virtualenv, remove with bug 849900
 # These paths refer to relative locations to test.zip, not the OBJDIR or SRCDIR
 here = os.path.dirname(os.path.realpath(__file__))
-mozbase = os.path.realpath(os.path.join(os.path.dirname(here), 'mozbase'))
+mozbase = os.path.realpath(os.path.join(os.path.dirname(here), '../../testing/mozbase'))
 
 if os.path.isdir(mozbase):
     for package in os.listdir(mozbase):
diff -ruN mozilla-release~/build/pgo/profileserver.py mozilla-release/build/pgo/profileserver.py
--- mozilla-release~/build/pgo/profileserver.py	2013-12-05 18:07:23.000000000 +0200
+++ mozilla-release/build/pgo/profileserver.py	2013-12-13 20:49:19.730389894 +0200
@@ -4,6 +4,43 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+import os
+import sys
+
+# Let's put all subdirectories under testing/mozbase/ here
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/manifestdestiny'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozb2g'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozcrash'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozdevice'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozfile'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozhttpd'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozinfo'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozinstall'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozlog'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/moznetwork'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozprocess'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozprofile'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozrunner'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozsystemmonitor'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/moztest'))
+
+# And all subdirectories under python/
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/blessings'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/codegen'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/configobj'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mach'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mock-1.0.0'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mozboot'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mozbuild'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mozversioncontrol'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/psutil'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/simplejson-2.1.1'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/which'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/virtualenv'))
+
+# And finally config/ itself
+sys.path.append(os.path.join(os.path.dirname(__file__), '../../config'))
+
 from mozprofile import FirefoxProfile, Profile, Preferences
 from mozprofile.permissions import ServerLocations
 from mozrunner import FirefoxRunner, CLI
@@ -11,8 +48,6 @@
 import json
 import socket
 import threading
-import os
-import sys
 import shutil
 import tempfile
 from datetime import datetime
diff -ruN mozilla-release~/client.mk mozilla-release/client.mk
--- mozilla-release~/client.mk	2013-12-05 18:07:23.000000000 +0200
+++ mozilla-release/client.mk	2013-12-13 20:47:26.078463612 +0200
@@ -245,7 +245,7 @@
 	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_GENERATE=1 MOZ_PGO_INSTRUMENTED=1
 	$(MAKE) -C $(PGO_OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=
 	rm -f ${PGO_OBJDIR}/jarlog/en-US.log
-	MOZ_PGO_INSTRUMENTED=1 JARLOG_FILE=jarlog/en-US.log EXTRA_TEST_ARGS=10 $(MAKE) -C $(PGO_OBJDIR) pgo-profile-run
+	MOZ_PGO_INSTRUMENTED=1 JARLOG_FILE=jarlog/en-US.log EXTRA_TEST_ARGS=10 topsrcdir=$(TOPSRCDIR) DEPTH=. PYTHON=python $(MAKE) -C $(PGO_OBJDIR) -f $(TOPSRCDIR)/testing/testsuite-targets.mk pgo-profile-run
 	$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild
 	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1