diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.classpath b/cmake/org.eclipse.cdt.cmake.is.arm.tests/.classpath
index 336abe9f465..73d6894a615 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.arm.tests/.classpath
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/">
+	<classpathentry kind="src" path="src">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/build.properties b/cmake/org.eclipse.cdt.cmake.is.core.doc/build.properties
index 92fb195f129..e419b5c2e0c 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.doc/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.core.doc/build.properties
@@ -6,5 +6,4 @@ bin.includes = META-INF/,\
                plugin.properties,\
                doc/,\
                about.html
-src.excludes = src/test/java/
 src.includes = about.html
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/.classpath b/cmake/org.eclipse.cdt.cmake.is.core.tests/.classpath
index b5519095830..73d6894a615 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.core.tests/.classpath
@@ -11,5 +11,5 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.classpath b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.classpath
index 247e5e43320..73d6894a615 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.classpath
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/">
+	<classpathentry kind="src" path="src">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-    <classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.classpath b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.classpath
index 247e5e43320..73d6894a615 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.classpath
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/">
+	<classpathentry kind="src" path="src">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-    <classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.classpath b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.classpath
index b5519095830..73d6894a615 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.classpath
@@ -11,5 +11,5 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>