diff --git a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
index 458edf7affd..6f6befabeec 100644
--- a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Make Core Tests Plug-in
 Bundle-SymbolicName: org.eclipse.cdt.make.core.tests;singleton:=true
 Bundle-Version: 5.0.100.qualifier
-Bundle-ClassPath: makecoretests.jar
 Bundle-Activator: org.eclipse.cdt.make.core.tests.MakeTestsPlugin
 Export-Package: org.eclipse.cdt.make.builder.tests,
  org.eclipse.cdt.make.core.tests
diff --git a/build/org.eclipse.cdt.make.core.tests/build.properties b/build/org.eclipse.cdt.make.core.tests/build.properties
index 7739a554cc6..38c5f6ba338 100644
--- a/build/org.eclipse.cdt.make.core.tests/build.properties
+++ b/build/org.eclipse.cdt.make.core.tests/build.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-source.makecoretests.jar = src/
-output.makecoretests.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = plugin.xml,\
-               makecoretests.jar,\
+               .,\
                META-INF/
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
index 60e07bb0684..cade5f70d21 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Managed Build UI Tests Plug-in
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.ui.tests; singleton:=true
 Bundle-Version: 5.0.100.qualifier
-Bundle-ClassPath: tests.jar
 Bundle-Activator: org.eclipse.cdt.managedbuilder.ui.tests.testplugin.TestsPlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/build.properties b/build/org.eclipse.cdt.managedbuilder.ui.tests/build.properties
index 22d243f8bee..5422bea1568 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/build.properties
@@ -8,9 +8,9 @@
 # Contributors:
 #     Texas Instruments - initial API and implementation
 ###############################################################################
-source.tests.jar = src/
-output.tests.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = plugin.xml,\
-               tests.jar,\
+               .,\
                about.html,\
                META-INF/
diff --git a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
index 349e397fbcf..c1f50798ce7 100644
--- a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.cdt.core.tests
 Bundle-SymbolicName: org.eclipse.cdt.core.tests; singleton:=true
 Bundle-Version: 5.1.0.qualifier
-Bundle-ClassPath: cdtcoretests.jar
 Bundle-Activator: org.eclipse.cdt.core.testplugin.CTestPlugin
 Export-Package: org.eclipse.cdt.core.cdescriptor.tests,
  org.eclipse.cdt.core.internal.errorparsers.tests;x-internal:=true,
diff --git a/core/org.eclipse.cdt.core.tests/build.properties b/core/org.eclipse.cdt.core.tests/build.properties
index 8144b2c064d..70b17f8d270 100644
--- a/core/org.eclipse.cdt.core.tests/build.properties
+++ b/core/org.eclipse.cdt.core.tests/build.properties
@@ -10,7 +10,7 @@
 ###############################################################################
 bin.includes = plugin.xml,\
                about.html,\
-               cdtcoretests.jar,\
+               .,\
                test.xml,\
                resources/,\
                META-INF/,\
@@ -19,13 +19,13 @@ bin.includes = plugin.xml,\
                parser/org/eclipse/cdt/core/parser/tests/ast2/,\
                parser/org/eclipse/cdt/core/parser/tests/scanner/
 
-output.cdtcoretests.jar = bin/
-source.cdtcoretests.jar = model/,\
-                          parser/,\
-                          suite/,\
-                          misc/,\
-                          regression/,\
-                          templateengine/
+output.. = bin/
+source.. = model/,\
+           parser/,\
+           suite/,\
+           misc/,\
+           regression/,\
+           templateengine/
 
 jre.compilation.profile=J2SE-1.5
 javacSource=1.5
diff --git a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
index ad276c9055b..e9d741edeab 100644
--- a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.cdt.ui.tests
 Bundle-SymbolicName: org.eclipse.cdt.ui.tests; singleton:=true
 Bundle-Version: 5.1.0.qualifier
-Bundle-ClassPath: cdtuitests.jar
 Bundle-Activator: org.eclipse.cdt.ui.testplugin.CTestPlugin
 Export-Package: org.eclipse.cdt.ui.testplugin,
  org.eclipse.cdt.ui.testplugin.util,
diff --git a/core/org.eclipse.cdt.ui.tests/build.properties b/core/org.eclipse.cdt.ui.tests/build.properties
index 790c39d7f7e..367d258b19d 100644
--- a/core/org.eclipse.cdt.ui.tests/build.properties
+++ b/core/org.eclipse.cdt.ui.tests/build.properties
@@ -8,12 +8,12 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-source.cdtuitests.jar = src/,\
-                        ui/
+source.. = src/,\
+           ui/
 bin.includes = plugin.xml,\
                about.html,\
                test.xml,\
-               cdtuitests.jar,\
+               .,\
                resources/,\
                icons/,\
                src/,\
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF
index cd7a05d9e09..9bcbd226006 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.cdt.debug.ui.tests
 Bundle-SymbolicName: org.eclipse.cdt.debug.ui.tests;singleton:=true
 Bundle-Version: 5.0.100.qualifier
-Bundle-ClassPath: cdtdebuguitests.jar
 Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
 Bundle-Localization: plugin
 Export-Package: org.eclipse.cdt.debug.core.tests,
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/build.properties b/debug/org.eclipse.cdt.debug.ui.tests/build.properties
index 7197056cb11..200f4655d0f 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/build.properties
+++ b/debug/org.eclipse.cdt.debug.ui.tests/build.properties
@@ -8,11 +8,11 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-source.cdtdebuguitests.jar = src/,\
-                       	   core/
+source.. = src/,\
+           core/
 bin.includes = about.html,\
                plugin.xml,\
                resources/,\
-               cdtdebuguitests.jar,\
+               .,\
                test.xml,\
                META-INF/