diff --git a/forge-ai/.project b/forge-ai/.project
index aab7576b1b5..21815fac93b 100644
--- a/forge-ai/.project
+++ b/forge-ai/.project
@@ -3,6 +3,7 @@
 	<name>forge-ai</name>
 	<comment></comment>
 	<projects>
+		<project>forge-game</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/forge-core/.classpath b/forge-core/.classpath
index f7bf6c0c0ab..95651cd7399 100644
--- a/forge-core/.classpath
+++ b/forge-core/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
diff --git a/forge-gui-desktop/.classpath b/forge-gui-desktop/.classpath
index f7bf6c0c0ab..0be04346393 100644
--- a/forge-gui-desktop/.classpath
+++ b/forge-gui-desktop/.classpath
@@ -1,9 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/forge-gui"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/forge-ai"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/forge-core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/forge-game"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/forge-gui-desktop/.project b/forge-gui-desktop/.project
index e33a537ce7b..fbe08c4028d 100644
--- a/forge-gui-desktop/.project
+++ b/forge-gui-desktop/.project
@@ -3,6 +3,9 @@
 	<name>forge-gui-desktop</name>
 	<comment></comment>
 	<projects>
+		<project>forge-core</project>
+		<project>forge-game</project>
+		<project>forge-gui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/forge-gui/.classpath b/forge-gui/.classpath
index f2ae73bd5d9..c3547c1336c 100644
--- a/forge-gui/.classpath
+++ b/forge-gui/.classpath
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>