diff --git a/libwvdrmengine/test/castv2/Android.mk b/libwvdrmengine/test/castv2/Android.mk
index 1b2b54b3..5c1a4e28 100644
--- a/libwvdrmengine/test/castv2/Android.mk
+++ b/libwvdrmengine/test/castv2/Android.mk
@@ -13,6 +13,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_JAVA_LIBRARIES := com.android.mediadrm.signer org.apache.http.legacy
 
 LOCAL_PACKAGE_NAME := CastSignAPITest
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 include $(BUILD_PACKAGE)
 
diff --git a/libwvdrmengine/test/java/Android.mk b/libwvdrmengine/test/java/Android.mk
index 93bdadcd..9a1ebaa0 100644
--- a/libwvdrmengine/test/java/Android.mk
+++ b/libwvdrmengine/test/java/Android.mk
@@ -14,8 +14,7 @@ LOCAL_DEX_PREOPT := false
 # When built, explicitly put it in the data/app partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-# TODO: This test app depends on framework implementation details.
-# LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := current
 
 include $(BUILD_PACKAGE)