diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index ab44a7630..5a54e6c56 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -233,7 +233,7 @@
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
         <!-- We need the ant runtime, as it includes junit -->
-        <javac srcdir="./src:./test" debug="true" source="1.5" target="1.5"
+        <javac srcdir="./src:./test/junit" debug="true" source="1.5" target="1.5"
                includeAntRuntime="true"
                deprecation="on" destdir="./build/obj" >
             <compilerarg line="${javac.compilerargs}" />
@@ -251,7 +251,7 @@
                 <pathelement location="../../../core/java/build/i2p.jar" />
             </classpath>
             <batchtest>
-                <fileset dir="./test/">
+                <fileset dir="./test/junit/">
                     <include name="**/*Test.java" />
                 </fileset>
             </batchtest>
diff --git a/apps/i2ptunnel/java/test/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java b/apps/i2ptunnel/java/test/junit/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java
similarity index 100%
rename from apps/i2ptunnel/java/test/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java
rename to apps/i2ptunnel/java/test/junit/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java
diff --git a/apps/ministreaming/java/test/net/i2p/client/streaming/StreamSinkClient.java b/apps/ministreaming/java/test/junit/net/i2p/client/streaming/StreamSinkClient.java
similarity index 100%
rename from apps/ministreaming/java/test/net/i2p/client/streaming/StreamSinkClient.java
rename to apps/ministreaming/java/test/junit/net/i2p/client/streaming/StreamSinkClient.java
diff --git a/apps/ministreaming/java/test/net/i2p/client/streaming/StreamSinkSend.java b/apps/ministreaming/java/test/junit/net/i2p/client/streaming/StreamSinkSend.java
similarity index 100%
rename from apps/ministreaming/java/test/net/i2p/client/streaming/StreamSinkSend.java
rename to apps/ministreaming/java/test/junit/net/i2p/client/streaming/StreamSinkSend.java
diff --git a/apps/ministreaming/java/test/net/i2p/client/streaming/StreamSinkServer.java b/apps/ministreaming/java/test/junit/net/i2p/client/streaming/StreamSinkServer.java
similarity index 100%
rename from apps/ministreaming/java/test/net/i2p/client/streaming/StreamSinkServer.java
rename to apps/ministreaming/java/test/junit/net/i2p/client/streaming/StreamSinkServer.java
diff --git a/apps/ministreaming/java/test/net/i2p/client/streaming/TestSwarm.java b/apps/ministreaming/java/test/junit/net/i2p/client/streaming/TestSwarm.java
similarity index 100%
rename from apps/ministreaming/java/test/net/i2p/client/streaming/TestSwarm.java
rename to apps/ministreaming/java/test/junit/net/i2p/client/streaming/TestSwarm.java
diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
index 971ae21cf..d145ce18e 100644
--- a/apps/streaming/java/build.xml
+++ b/apps/streaming/java/build.xml
@@ -11,7 +11,7 @@
     <target name="depend" if="depend.available">
         <depend
             cache="../../../build"
-            srcdir="./src:./test" 
+            srcdir="./src:./test/junit" 
             destdir="./build/obj" >
             <!-- Depend on classes instead of jars where available -->
             <classpath>
@@ -35,7 +35,7 @@
     </target>
     <target name="compileTest" depends="compile">
         <javac 
-            srcdir="./test" 
+            srcdir="./test/junit" 
             debug="true" deprecation="on" source="1.5" target="1.5" 
             includeAntRuntime="false"
             destdir="./build/obj" 
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/ConnectCloseTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectCloseTest.java
similarity index 100%
rename from apps/streaming/java/test/net/i2p/client/streaming/ConnectCloseTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectCloseTest.java
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/ConnectInactivityTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectInactivityTest.java
similarity index 100%
rename from apps/streaming/java/test/net/i2p/client/streaming/ConnectInactivityTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectInactivityTest.java
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/ConnectTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTest.java
similarity index 100%
rename from apps/streaming/java/test/net/i2p/client/streaming/ConnectTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTest.java
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/ConnectTimeoutTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTimeoutTest.java
similarity index 100%
rename from apps/streaming/java/test/net/i2p/client/streaming/ConnectTimeoutTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTimeoutTest.java
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/EchoLargeTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoLargeTest.java
similarity index 100%
rename from apps/streaming/java/test/net/i2p/client/streaming/EchoLargeTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/EchoLargeTest.java
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/EchoTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoTest.java
similarity index 100%
rename from apps/streaming/java/test/net/i2p/client/streaming/EchoTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/EchoTest.java
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/MessageInputStreamTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageInputStreamTest.java
similarity index 100%
rename from apps/streaming/java/test/net/i2p/client/streaming/MessageInputStreamTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/MessageInputStreamTest.java
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/MessageOutputStreamTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageOutputStreamTest.java
similarity index 100%
rename from apps/streaming/java/test/net/i2p/client/streaming/MessageOutputStreamTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/MessageOutputStreamTest.java
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/PingTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/PingTest.java
similarity index 100%
rename from apps/streaming/java/test/net/i2p/client/streaming/PingTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/PingTest.java
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTest.java
similarity index 100%
rename from apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTest.java
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestClient.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestClient.java
similarity index 100%
rename from apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestClient.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestClient.java
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestServer.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestServer.java
similarity index 100%
rename from apps/streaming/java/test/net/i2p/client/streaming/StreamSinkTestServer.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestServer.java