diff --git a/tests/Android.mk b/tests/Android.mk
new file mode 100644
index 00000000..fb522fc9
--- /dev/null
+++ b/tests/Android.mk
@@ -0,0 +1,35 @@
+# Build rules for tests to be included in the google_tests.zip package
+# are discovered by having an Android.mk file located in vendor/<project>/tests/.
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+# Targets to be included in google_tests.zip
+# Referenced by vendor/google/build/tasks/google_tests.mk
+WIDEVINE_TEST_MAKE_TARGETS := \
+    cdm_engine_test \
+    cdm_extended_duration_test \
+    cdm_session_unittest \
+    device_files_unittest \
+    file_store_unittest \
+    initialization_data_unittest \
+    libwvdrmdrmplugin_test \
+    libwvdrmengine_test \
+    libwvdrmmediacrypto_test \
+    license_unittest \
+    max_res_engine_unittest \
+    MediaDrmAPITest \
+    oemcrypto_test \
+    policy_engine_unittest \
+    request_license_test \
+    timer_unittest \
+
+# Call the makefiles for all our tests used in TradeFederation
+MODULAR_DRM_PATH := vendor/widevine/libwvdrmengine
+include $(MODULAR_DRM_PATH)/test/gmock/Android.mk
+include $(MODULAR_DRM_PATH)/cdm/test/Android.mk
+include $(MODULAR_DRM_PATH)/mediacrypto/test/Android.mk
+include $(MODULAR_DRM_PATH)/mediadrm/test/Android.mk
+include $(MODULAR_DRM_PATH)/oemcrypto/test/Android.mk
+include $(MODULAR_DRM_PATH)/test/unit/Android.mk
+include $(MODULAR_DRM_PATH)/test/java/Android.mk