diff --git a/.classpath b/.classpath
index 5b14275ee..c4a2c35d3 100644
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/server/java"/>
-	<classpathentry kind="src" path="tests/src"/>
+	<classpathentry kind="src" path="tests/java/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/servlet-api-2.5.jar" sourcepath="lib-src/servlet-api-2.5-sources.jar"/>
 	<classpathentry kind="lib" path="lib/jetty-6.1.22.jar" sourcepath="lib-src/jetty-6.1.22-sources.jar"/>
diff --git a/tests/lib-src/junit-4.8.1-sources.jar b/tests/java/lib-src/junit-4.8.1-sources.jar
similarity index 100%
rename from tests/lib-src/junit-4.8.1-sources.jar
rename to tests/java/lib-src/junit-4.8.1-sources.jar
diff --git a/tests/lib/junit-4.8.1.jar b/tests/java/lib/junit-4.8.1.jar
similarity index 100%
rename from tests/lib/junit-4.8.1.jar
rename to tests/java/lib/junit-4.8.1.jar
diff --git a/tests/src/com/metaweb/gridworks/tests/GridworksTests.java b/tests/java/src/com/metaweb/gridworks/tests/GridworksTests.java
similarity index 100%
rename from tests/src/com/metaweb/gridworks/tests/GridworksTests.java
rename to tests/java/src/com/metaweb/gridworks/tests/GridworksTests.java