diff --git a/libwvdrmengine/build_all_unit_tests.sh b/libwvdrmengine/build_all_unit_tests.sh
index 225f7f5e..3506e636 100755
--- a/libwvdrmengine/build_all_unit_tests.sh
+++ b/libwvdrmengine/build_all_unit_tests.sh
@@ -11,7 +11,7 @@ fi
 # copy files to a specific android device by providing a serial number.
 # The default build target is for AIDL service, use "-t hidl" to
 # build for HIDL service.
-BUILD_TARGET=""
+WV_UNITTESTS_BUILD_TARGET=""
 NUM_CORES=1
 SERIAL_NUM=""
 while getopts "j:s:t:" opt; do
@@ -23,7 +23,7 @@ while getopts "j:s:t:" opt; do
       SERIAL_NUM="-s $OPTARG"
       ;;
     t)
-      BUILD_TARGET="BUILD_TARGET=$OPTARG"
+      WV_UNITTESTS_BUILD_TARGET="WV_UNITTESTS_BUILD_TARGET=$OPTARG"
       ;;
   esac
 done
@@ -34,7 +34,7 @@ done
 # Build all the targets
 # This list is slightly longer than the one in run_all_unit_tests.sh because
 # it does not run very long tests or tests needing special setup.
-WV_TEST_TARGETS="base64_test \
+WV_UNITTESTS="base64_test \
      buffer_reader_test \
      cdm_coverage_test \
      cdm_engine_test \
@@ -80,7 +80,7 @@ WV_TEST_TARGETS="base64_test \
 
 cd $ANDROID_BUILD_TOP
 pwd
-m -j $NUM_CORES $WV_TEST_TARGETS $BUILD_TARGET
+m -j $NUM_CORES $WV_UNITTESTS $WV_UNITTESTS_BUILD_TARGET
 
 
 # Detect the device and check if Verity is going to stop the script from working
@@ -115,6 +115,6 @@ try_adb_push() {
 }
 
 # Push the tests to the device
-for f in $WV_TEST_TARGETS; do
+for f in $WV_UNITTESTS; do
   try_adb_push $f
 done
diff --git a/libwvdrmengine/cdm/test/coverage-test.mk b/libwvdrmengine/cdm/test/coverage-test.mk
index f22bada3..d511a072 100644
--- a/libwvdrmengine/cdm/test/coverage-test.mk
+++ b/libwvdrmengine/cdm/test/coverage-test.mk
@@ -3,13 +3,11 @@
 #
 include $(CLEAR_VARS)
 
-BUILD_TARGET?=
-ifeq ($(BUILD_TARGET), hidl)
-$(info Building '$(test_name)' for HIDL service.)
+WV_UNITTESTS_BUILD_TARGET?=
+ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
 HIDL_EXTENSION := _hidl
 LIB_BINDER := libhidlbase
 else
-$(info Building '$(test_name)' for AIDL service.)
 HIDL_EXTENSION :=
 LIB_BINDER := libbinder
 endif
diff --git a/libwvdrmengine/cdm/test/integration-test.mk b/libwvdrmengine/cdm/test/integration-test.mk
index 1997e66f..b5638969 100644
--- a/libwvdrmengine/cdm/test/integration-test.mk
+++ b/libwvdrmengine/cdm/test/integration-test.mk
@@ -6,13 +6,11 @@ $(call assert-not-null,test_name)
 
 include $(CLEAR_VARS)
 
-BUILD_TARGET?=
-ifeq ($(BUILD_TARGET), hidl)
-$(info Building '$(test_name)' for HIDL service.)
+WV_UNITTESTS_BUILD_TARGET?=
+ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
 HIDL_EXTENSION := _hidl
 LIB_BINDER := libhidlbase
 else
-$(info Building '$(test_name)' for AIDL service.)
 HIDL_EXTENSION :=
 LIB_BINDER := libbinder
 endif
diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk
index 5bdde39b..f0e26743 100644
--- a/libwvdrmengine/cdm/test/unit-test.mk
+++ b/libwvdrmengine/cdm/test/unit-test.mk
@@ -6,13 +6,11 @@ $(call assert-not-null,test_name)
 
 include $(CLEAR_VARS)
 
-BUILD_TARGET?=
-ifeq ($(BUILD_TARGET), hidl)
-$(info Building '$(test_name)' for HIDL service.)
+WV_UNITTESTS_BUILD_TARGET?=
+ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
 HIDL_EXTENSION := _hidl
 LIB_BINDER := libhidlbase
 else
-$(info Building '$(test_name)' for AIDL service.)
 HIDL_EXTENSION :=
 LIB_BINDER := libbinder
 endif
diff --git a/libwvdrmengine/oemcrypto/test/common.mk b/libwvdrmengine/oemcrypto/test/common.mk
index e4c31d53..7b3991c9 100644
--- a/libwvdrmengine/oemcrypto/test/common.mk
+++ b/libwvdrmengine/oemcrypto/test/common.mk
@@ -1,12 +1,10 @@
 LOCAL_PATH:= $(call my-dir)
 
-BUILD_TARGET?=
-ifeq ($(BUILD_TARGET), hidl)
-$(info Building 'oemcrypt_test' for HIDL service.)
+WV_UNITTESTS_BUILD_TARGET?=
+ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
 HIDL_EXTENSION := _hidl
 LIB_BINDER := libhidlbase
 else
-$(info Building 'oemcrypt_test' for AIDL service.)
 HIDL_EXTENSION :=
 LIB_BINDER := libbinder
 endif