diff --git a/Android.mk b/Android.mk
index a3b785d..ba81e8f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,5 +7,5 @@ LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE_CLASS := tests
 LOCAL_MODULE := Switches.sh
 LOCAL_SRC_FILES := ../../external/pm-qa/Switches.sh
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/benchmark/pm-qa
+LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa
 include $(BUILD_PREBUILT)
diff --git a/cpufreq/Android.mk b/cpufreq/Android.mk
index bd07fae..15d6d9e 100644
--- a/cpufreq/Android.mk
+++ b/cpufreq/Android.mk
@@ -10,7 +10,7 @@ define $(module_name)_add_executable
     LOCAL_MODULE := $1.sh
     systemtarball: $1.sh
     LOCAL_SRC_FILES := $1.sh
-    LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/benchmark/pm-qa/$(module_name)
+    LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
     include $(BUILD_PREBUILT)
 endef
 
diff --git a/cpuhotplug/Android.mk b/cpuhotplug/Android.mk
index 7095044..fabb70a 100644
--- a/cpuhotplug/Android.mk
+++ b/cpuhotplug/Android.mk
@@ -10,7 +10,7 @@ define $(module_name)_add_executable
     LOCAL_MODULE := $1.sh
     systemtarball: $1.sh
     LOCAL_SRC_FILES := $1.sh
-    LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/benchmark/pm-qa/$(module_name)
+    LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
     include $(BUILD_PREBUILT)
 endef
 
@@ -24,7 +24,7 @@ define $(module_name)_etc_add_executable
     LOCAL_MODULE := $1.sh
     systemtarball: $1.sh
     LOCAL_SRC_FILES := $1.sh
-    LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/benchmark/pm-qa/$(module_name)
+    LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
     include $(BUILD_PREBUILT)
 endef
 
diff --git a/cpuidle/Android.mk b/cpuidle/Android.mk
index 07972de..1d1292c 100644
--- a/cpuidle/Android.mk
+++ b/cpuidle/Android.mk
@@ -10,7 +10,7 @@ define $(module_name)_add_executable
     LOCAL_MODULE := $1.sh
     systemtarball: $1.sh
     LOCAL_SRC_FILES := $1.sh
-    LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/benchmark/pm-qa/$(module_name)
+    LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
     include $(BUILD_PREBUILT)
 endef
 
@@ -23,5 +23,5 @@ systemtarball: cpuidle_killer
 LOCAL_SRC_FILES:= cpuidle_killer.c
 LOCAL_STATIC_LIBRARIES := libcutils libc 
 LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/benchmark/pm-qa/$(module_name)
+LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
 include $(BUILD_EXECUTABLE)
diff --git a/cputopology/Android.mk b/cputopology/Android.mk
index d8cc159..d5b5480 100644
--- a/cputopology/Android.mk
+++ b/cputopology/Android.mk
@@ -10,7 +10,7 @@ define $(module_name)_add_executable
     LOCAL_MODULE := $1.sh
     systemtarball: $1.sh
     LOCAL_SRC_FILES := $1.sh
-    LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/benchmark/pm-qa/$(module_name)
+    LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
     include $(BUILD_PREBUILT)
 endef
 
diff --git a/include/Android.mk b/include/Android.mk
index 9560fc1..efb20f2 100644
--- a/include/Android.mk
+++ b/include/Android.mk
@@ -10,7 +10,7 @@ define $(module_name)_etc_add_executable
     LOCAL_MODULE := $1.sh
     systemtarball: $1.sh
     LOCAL_SRC_FILES := $1.sh
-    LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/benchmark/pm-qa/$(module_name)
+    LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
     include $(BUILD_PREBUILT)
 endef
 
diff --git a/suspend/Android.mk b/suspend/Android.mk
index fc85f6d..f44f9ff 100644
--- a/suspend/Android.mk
+++ b/suspend/Android.mk
@@ -10,7 +10,7 @@ define $(module_name)_add_executable
     LOCAL_MODULE := $1.sh
     systemtarball: $1.sh
     LOCAL_SRC_FILES := $1.sh
-    LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/benchmark/pm-qa/$(module_name)
+    LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
     include $(BUILD_PREBUILT)
 endef
 
diff --git a/thermal/Android.mk b/thermal/Android.mk
index de4edbf..4614630 100644
--- a/thermal/Android.mk
+++ b/thermal/Android.mk
@@ -10,7 +10,7 @@ define $(module_name)_add_executable
     LOCAL_MODULE := $1.sh
     systemtarball: $1.sh
     LOCAL_SRC_FILES := $1.sh
-    LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/benchmark/pm-qa/$(module_name)
+    LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
     include $(BUILD_PREBUILT)
 endef
 
diff --git a/utils/Android.mk b/utils/Android.mk
index 8c9c644..7c1cd99 100644
--- a/utils/Android.mk
+++ b/utils/Android.mk
@@ -10,7 +10,7 @@ define $(module_name)_etc_add_executable
     LOCAL_MODULE := $1
     systemtarball: $1
     LOCAL_SRC_FILES := $1.c
-    LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/benchmark/pm-qa/$(module_name)
+    LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
     include $(BUILD_EXECUTABLE)
 endef
 
