diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
index bee94051c2e..80bc05a2b7a 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
@@ -640,6 +640,9 @@
     <logFile
       name="org.eclipse.jdt.debug.tests"
       type="test" />
+    <logFile
+      name="org.eclipse.jdt.debug.jdi.tests"
+      type="test" />
     <logFile
       name="org.eclipse.jdt.text.tests"
       type="test" />
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
index 87fd2d55a3b..a5d1fce2d35 100644
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
@@ -143,6 +143,10 @@
          id="org.eclipse.jdt.debug.tests"
          version="0.0.0"/>
 
+   <plugin
+         id="org.eclipse.jdt.debug.jdi.tests"
+         version="0.0.0"/>
+
    <plugin
          id="org.eclipse.jdt.ui.tests"
          version="0.0.0"/>
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 7c4420adfaf..332c533822f 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -2136,6 +2136,12 @@
     <runTests testPlugin="org.eclipse.jdt.debug.tests" />
   </target>
 
+  <target
+    name="jdtjdi"
+    depends="init">
+    <runTests testPlugin="org.eclipse.jdt.debug.jdi.tests" />
+  </target>
+
   <target
     name="jdtui"
     depends="init">
@@ -2730,6 +2736,7 @@
     <antcall target="jdtcoreperf" />
     <antcall target="jdtcorebuilder" />
     <antcall target="jdtdebug" />
+    <antcall target="jdtjdi" />  	
     <antcall target="jdtapt" />
     <antcall target="jdtaptpluggable" />
   </target>