diff --git a/tests/Android.mk b/tests/Android.mk
index ef478e9f..bb001331 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -14,10 +14,12 @@ WIDEVINE_TEST_MAKE_TARGETS += \
     base64_test \
     buffer_reader_test \
     cdm_coverage_test \
+    cdm_engine_metrics_decorator_unittest \
     cdm_engine_test \
     cdm_extended_duration_test \
     cdm_feature_test \
     cdm_session_unittest \
+    certificate_provisioning_unittest \
     counter_metric_unittest \
     crypto_session_unittest \
     device_files_unittest \
@@ -25,18 +27,26 @@ WIDEVINE_TEST_MAKE_TARGETS += \
     event_metric_unittest \
     file_store_unittest \
     file_utils_unittest \
+    generic_crypto_unittest \
+    hidl_metrics_adapter_unittest \
     http_socket_test \
     initialization_data_unittest \
+    keybox_ota_test \
     libwvdrmdrmplugin_hidl_test \
     libwvdrmengine_hidl_test \
     libwvdrmmediacrypto_hidl_test \
     license_keys_unittest \
     license_unittest \
+    metrics_collections_unittest \
     odk_test \
     oemcrypto_test \
+    okp_fallback_policy_test \
+    ota_keybox_provisioner_test \
     policy_engine_constraints_unittest \
     policy_engine_unittest \
+    policy_integration_test \
     request_license_test \
+    rw_lock_test \
     service_certificate_unittest \
     timer_unittest \
     usage_table_header_unittest \