diff --git a/run-tests.py b/run-tests.py
old mode 100644
new mode 100755
index 44c4e3d84..6a33c4ecc
--- a/run-tests.py
+++ b/run-tests.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 #
 # Copyright (C) 2015 The Android Open Source Project
 #
@@ -79,7 +80,7 @@ def mmm(path):
 
 def gen_build_cmds(bitness, compiler, host):
     gen_test_config(bitness, compiler, host)
-    mmm(os.path.join(THIS_DIR, 'buildcmds'))
+    mmm('external/libcxx/buildcmds')
 
 
 def main():
diff --git a/test/libcxx/android/test/config.py b/test/libcxx/android/test/config.py
index bff0c4597..898d10bfc 100644
--- a/test/libcxx/android/test/config.py
+++ b/test/libcxx/android/test/config.py
@@ -40,7 +40,7 @@ class Configuration(libcxx.test.config.Configuration):
 
     def configure_build_cmds(self):
         os.chdir(self.config.android_root)
-        self.build_cmds_dir = os.path.join(self.libcxx_src_root, 'buildcmds')
+        self.build_cmds_dir = 'external/libcxx/buildcmds'
         if not libcxx.android.build.mm(self.build_cmds_dir,
                                        self.config.android_root):
             raise RuntimeError('Could not generate build commands.')