diff --git a/OldCtsTestCaseList.mk b/OldCtsTestCaseList.mk
index 6b30aee..45a25f9 100644
--- a/OldCtsTestCaseList.mk
+++ b/OldCtsTestCaseList.mk
@@ -161,7 +161,6 @@
     CtsCarTestCases \
     CtsContentTestCases \
     CtsDatabaseTestCases \
-    CtsDeviceAdminUninstallerTestCases \
     CtsDisplayTestCases \
     CtsDpiTestCases \
     CtsDpiTestCases2 \
diff --git a/tests/deviceadmin/deviceadminapp/Android.mk b/tests/deviceadmin/deviceadminapp/Android.mk
index 6ee3943..29c7cb3 100644
--- a/tests/deviceadmin/deviceadminapp/Android.mk
+++ b/tests/deviceadmin/deviceadminapp/Android.mk
@@ -31,4 +31,4 @@
 # tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-include $(BUILD_CTS_PACKAGE)
+include $(BUILD_PACKAGE)
diff --git a/tests/deviceadmin/uninstalltest/Android.mk b/tests/deviceadmin/uninstalltest/Android.mk
index ceee809..03831e2 100644
--- a/tests/deviceadmin/uninstalltest/Android.mk
+++ b/tests/deviceadmin/uninstalltest/Android.mk
@@ -31,4 +31,4 @@
 # tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-include $(BUILD_CTS_PACKAGE)
+include $(BUILD_PACKAGE)