diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 2860c73..d878d63 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -156,6 +156,9 @@
 cts_device_executables := \
     print-instrument
 
+cts_target_junit_tests := \
+    CtsJdwp
+
 # 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)) \
@@ -163,6 +166,7 @@
     $(call cts-get-native-paths,$(cts_native_exes)) \
     $(call cts-get-ui-lib-paths,$(cts_ui_tests)) \
     $(call cts-get-ui-lib-paths,$(cts_device_jars)) \
+    $(call cts-get-ui-lib-paths,$(cts_target_junit_tests)) \
     $(call cts-get-executable-paths,$(cts_device_executables))
 
 # All the XMLs that will end up under the repository/testcases
@@ -170,6 +174,7 @@
 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)) \
+    $(call cts-get-test-xmls,$(cts_target_junit_tests)) \
     $(call cts-get-test-xmls,$(cts_ui_tests))
 
 # The following files will be placed in the tools directory of the CTS distribution