diff --git a/test/BugPoint/misopt-basictest.ll b/test/BugPoint/misopt-basictest.ll
index 1ba9adb82b8..76363dfb1f6 100644
--- a/test/BugPoint/misopt-basictest.ll
+++ b/test/BugPoint/misopt-basictest.ll
@@ -1,4 +1,5 @@
-; RUN: export PATH=/usr/bin:/bin/:${PATH}
+; RUN: PATH=/usr/bin:/bin/:${PATH}
+; RUN: export PATH
 ; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg
 
 %.LC0 = internal global [13 x sbyte] c"Hello World\0A\00"
diff --git a/test/Makefile b/test/Makefile
index 29f823666a8..3b98ef8b98b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,12 +1,17 @@
 LEVEL  = ..
 DIRS   = Programs
-include Makefile.tests
 
 #
 # Make QMTest the default for testing features and regressions
+# Do this first to force QMTest to run first
 #
 all:: qmtest
 
+#
+# Include other test rules
+#
+include Makefile.tests
+
 #
 # New QMTest functionality:
 #	The test suite is being transitioned over to QMTest.  Eventually, it