--- client.mk.orig	2013-07-02 06:56:49.571431047 +0400
+++ mozilla-release/client.mk	2013-07-07 15:54:55.489527635 +0400
@@ -201,7 +201,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

--- mozilla-release/build/automation.py.in~	2013-07-30 22:40:47.000000000 +0400
+++ mozilla-release/build/automation.py.in	2013-08-07 21:46:43.299846545 +0400
@@ -28,7 +28,7 @@
 # TODO: this is a hack for mozbase without virtualenv, remove with bug 849900
 #
 here = os.path.dirname(__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'))
 
 try:
     import mozcrash