diff --git a/libwvdrmengine/build_and_run_all_unit_tests.sh b/libwvdrmengine/build_and_run_all_unit_tests.sh
index 96071867..b9f26aa8 100755
--- a/libwvdrmengine/build_and_run_all_unit_tests.sh
+++ b/libwvdrmengine/build_and_run_all_unit_tests.sh
@@ -67,8 +67,6 @@ try_adb_push $OUT/system/bin/device_files_unittest
 try_adb_push $OUT/system/bin/timer_unittest
 try_adb_push $OUT/system/bin/libwvdrmengine_test
 try_adb_push $OUT/system/bin/buffer_reader_test
-try_adb_push $OUT/system/bin/circular_buffer_test
-try_adb_push $OUT/system/bin/entry_writer_test
 adb install -r $OUT/system/app/MediaDrmAPITest/MediaDrmAPITest.apk
 
 cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine
diff --git a/libwvdrmengine/run_all_unit_tests.sh b/libwvdrmengine/run_all_unit_tests.sh
index 340217c6..3e932b3a 100755
--- a/libwvdrmengine/run_all_unit_tests.sh
+++ b/libwvdrmengine/run_all_unit_tests.sh
@@ -82,8 +82,6 @@ adb_shell_run initialization_data_unittest
 adb_shell_run device_files_unittest
 adb_shell_run timer_unittest
 adb_shell_run buffer_reader_test
-adb_shell_run circular_buffer_test
-adb_shell_run entry_writer_test
 
 library_path="/system/vendor/lib/mediadrm/ "
 adb_shell_run libwvdrmengine_test LD_LIBRARY_PATH=$library_path