diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 840d42b..70f3ef9 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -24,10 +24,22 @@
 	CtsTargetInstrumentationApp \
 	CtsUsePermissionDiffCert
 
-# These test cases will be analyzed by the CTS API coverage tools. 
-CTS_COVERAGE_TEST_CASE_LIST := \
-	CtsAccelerationTestCases \
+# Any APKs that need to be copied to the CTS distribution's testcases
+# directory but do not require an associated test package XML.
+CTS_TEST_CASE_LIST := \
+	TestDeviceSetup \
 	CtsAccelerationTestStubs \
+	CtsDelegatingAccessibilityService \
+	CtsDeviceAdmin \
+	CtsTestStubs \
+	SignatureTest \
+	ApiDemos \
+	ApiDemosReferenceTest \
+	$(CTS_SECURITY_APPS_LIST)
+
+# Test packages that require an associated test package XML.
+CTS_TEST_PACKAGES := \
+	CtsAccelerationTestCases \
 	CtsAccessibilityServiceTestCases \
 	CtsAccountManagerTestCases \
 	CtsAdminTestCases \
@@ -61,30 +73,37 @@
 	CtsSecurityTestCases \
 	CtsSpeechTestCases \
 	CtsTelephonyTestCases \
-	CtsTestStubs \
 	CtsTextTestCases \
 	CtsUtilTestCases \
 	CtsViewTestCases \
 	CtsWebkitTestCases \
 	CtsWidgetTestCases
 
-CTS_TEST_CASE_LIST := \
-	TestDeviceSetup \
-	CtsDelegatingAccessibilityService \
-	CtsDeviceAdmin \
-	SignatureTest \
-	ApiDemos \
-	ApiDemosReferenceTest \
-	$(CTS_COVERAGE_TEST_CASE_LIST) \
-	$(CTS_SECURITY_APPS_LIST)
+# All APKs that need to be scanned by the coverage utilities.
+CTS_COVERAGE_TEST_CASE_LIST := \
+	$(CTS_TEST_CASE_LIST) \
+	$(CTS_TEST_PACKAGES)
 
+# Host side only tests
+CTS_HOST_LIBRARIES := \
+    CtsAppSecurityTests
+
+# Native test executables that need to have associated test XMLs.
 CTS_NATIVE_EXES := \
 	NativeMediaTest_SL \
 	NativeMediaTest_XA
 
-CTS_TEST_CASES := $(call cts-get-native-paths,$(CTS_NATIVE_EXES))
+# All the files that will end up under the repository/testcases
+# directory of the final CTS distribution.
+CTS_TEST_CASES := $(call cts-get-lib-paths,$(CTS_HOST_LIBRARIES)) \
+		$(call cts-get-package-paths,$(CTS_TEST_PACKAGES)) \
+		$(call cts-get-native-paths,$(CTS_NATIVE_EXES))
 
-CTS_TEST_XMLS := $(call cts-get-native-xmls,$(CTS_NATIVE_EXES))
+# All the XMLs that will end up under the repository/testcases
+# and that need to be created before making the final CTS distribution.
+CTS_TEST_XMLS := $(call cts-get-test-xmls,$(CTS_HOST_LIBRARIES)) \
+		$(call cts-get-test-xmls,$(CTS_TEST_PACKAGES)) \
+		$(call cts-get-test-xmls,$(CTS_NATIVE_EXES))
 
 # The following files will be placed in the tools directory of the CTS distribution
 CTS_TOOLS_LIST :=