diff --git a/libwvdrmengine/test/java/Android.mk b/libwvdrmengine/test/java/MediaDrmApiTest/Android.mk
similarity index 100%
rename from libwvdrmengine/test/java/Android.mk
rename to libwvdrmengine/test/java/MediaDrmApiTest/Android.mk
diff --git a/libwvdrmengine/test/java/AndroidManifest.xml b/libwvdrmengine/test/java/MediaDrmApiTest/AndroidManifest.xml
similarity index 100%
rename from libwvdrmengine/test/java/AndroidManifest.xml
rename to libwvdrmengine/test/java/MediaDrmApiTest/AndroidManifest.xml
diff --git a/libwvdrmengine/test/java/default.properties b/libwvdrmengine/test/java/MediaDrmApiTest/default.properties
similarity index 100%
rename from libwvdrmengine/test/java/default.properties
rename to libwvdrmengine/test/java/MediaDrmApiTest/default.properties
diff --git a/libwvdrmengine/test/java/res/drawable-hdpi/icon.png b/libwvdrmengine/test/java/MediaDrmApiTest/res/drawable-hdpi/icon.png
similarity index 100%
rename from libwvdrmengine/test/java/res/drawable-hdpi/icon.png
rename to libwvdrmengine/test/java/MediaDrmApiTest/res/drawable-hdpi/icon.png
diff --git a/libwvdrmengine/test/java/res/drawable-ldpi/icon.png b/libwvdrmengine/test/java/MediaDrmApiTest/res/drawable-ldpi/icon.png
similarity index 100%
rename from libwvdrmengine/test/java/res/drawable-ldpi/icon.png
rename to libwvdrmengine/test/java/MediaDrmApiTest/res/drawable-ldpi/icon.png
diff --git a/libwvdrmengine/test/java/res/drawable-mdpi/icon.png b/libwvdrmengine/test/java/MediaDrmApiTest/res/drawable-mdpi/icon.png
similarity index 100%
rename from libwvdrmengine/test/java/res/drawable-mdpi/icon.png
rename to libwvdrmengine/test/java/MediaDrmApiTest/res/drawable-mdpi/icon.png
diff --git a/libwvdrmengine/test/java/res/layout/main.xml b/libwvdrmengine/test/java/MediaDrmApiTest/res/layout/main.xml
similarity index 100%
rename from libwvdrmengine/test/java/res/layout/main.xml
rename to libwvdrmengine/test/java/MediaDrmApiTest/res/layout/main.xml
diff --git a/libwvdrmengine/test/java/res/values/strings.xml b/libwvdrmengine/test/java/MediaDrmApiTest/res/values/strings.xml
similarity index 100%
rename from libwvdrmengine/test/java/res/values/strings.xml
rename to libwvdrmengine/test/java/MediaDrmApiTest/res/values/strings.xml
diff --git a/libwvdrmengine/test/java/src/com/widevine/test/KeyRequester.java b/libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/KeyRequester.java
similarity index 100%
rename from libwvdrmengine/test/java/src/com/widevine/test/KeyRequester.java
rename to libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/KeyRequester.java
diff --git a/libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java b/libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/MediaDrmAPITest.java
similarity index 100%
rename from libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java
rename to libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/MediaDrmAPITest.java
diff --git a/libwvdrmengine/test/java/src/com/widevine/test/ProvisionRequester.java b/libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/ProvisionRequester.java
similarity index 100%
rename from libwvdrmengine/test/java/src/com/widevine/test/ProvisionRequester.java
rename to libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/ProvisionRequester.java
diff --git a/libwvdrmengine/test/java/src/com/widevine/test/TestVector.java b/libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/TestVector.java
similarity index 100%
rename from libwvdrmengine/test/java/src/com/widevine/test/TestVector.java
rename to libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/TestVector.java
diff --git a/libwvdrmengine/test/java/src/com/widevine/test/TestVectors.java b/libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/TestVectors.java
similarity index 100%
rename from libwvdrmengine/test/java/src/com/widevine/test/TestVectors.java
rename to libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/TestVectors.java
diff --git a/tests/Android.mk b/tests/Android.mk
index 1d25c909..ee1c0311 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -49,5 +49,5 @@ 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
+include $(MODULAR_DRM_PATH)/test/java/MediaDrmApiTest/Android.mk
 include $(MODULAR_DRM_PATH)/test/castv2/Android.mk