diff --git a/libwvdrmengine/build_and_run_all_unit_tests.sh b/libwvdrmengine/build_and_run_all_unit_tests.sh
index c343cb17..b6ed9369 100755
--- a/libwvdrmengine/build_and_run_all_unit_tests.sh
+++ b/libwvdrmengine/build_and_run_all_unit_tests.sh
@@ -43,5 +43,21 @@ cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/test/java/src/com/widevine/
 pwd
 mm
 
+echo "waiting for device"
+adb root && adb wait-for-device remount
+
+
+adb push $OUT/system/bin/oemcrypto_test /system/bin
+adb push $OUT/system/bin/request_license_test /system/bin
+adb push $OUT/system/bin/policy_engine_unittest /system/bin
+adb push $OUT/system/bin/libwvdrmmediacrypto_test /system/bin
+adb push $OUT/system/bin/libwvdrmdrmplugin_test /system/bin
+adb push $OUT/system/bin/cdm_engine_test /system/bin
+adb push $OUT/system/bin/file_store_unittest /system/bin
+adb push $OUT/system/bin/device_files_unittest /system/bin
+adb push $OUT/system/bin/timer_unittest /system/bin
+adb push $OUT/system/bin/libwvdrmengine_test /system/bin
+adb install -r $OUT/system/app/MediaDrmAPITest.apk
+
 cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine
 ./run_all_unit_tests.sh
diff --git a/libwvdrmengine/run_all_unit_tests.sh b/libwvdrmengine/run_all_unit_tests.sh
index fab07739..c015883b 100755
--- a/libwvdrmengine/run_all_unit_tests.sh
+++ b/libwvdrmengine/run_all_unit_tests.sh
@@ -6,7 +6,7 @@ if [ -z "$ANDROID_BUILD_TOP" ]; then
 fi
 
 echo "waiting for device"
-adb root && adb wait-for-device remount && adb sync
+adb root && adb wait-for-device remount
 
 adb shell /system/bin/oemcrypto_test
 adb shell /system/bin/request_license_test