diff --git a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
index 5c230c34a17aea1f57f3b1cee89d6070dfd5d6ad..e8fbd8f225c0f7bf7649d4f12b5188737024cbfb 100644
--- a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
+++ b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
@@ -76,7 +76,7 @@ class LocalClientManager extends ClientManager {
                 if (jitter > 0)
                     delay += (int) (jitter * _ctx.random().nextGaussian());
                 if (delay > 0) {
-                    System.out.println("Message " + msgId + " DELAYED " + delay + " ms");
+                    //System.out.println("Message " + msgId + " DELAYED " + delay + " ms");
                     DelayedSend ds = new DelayedSend(_ctx, sender, runner, fromDest, toDest, payload, msgId, messageNonce);
                     ds.schedule(delay);
                     return;
diff --git a/router/java/test/junit/net/i2p/router/SSUDemo.java b/router/java/test/junit/net/i2p/router/transport/SSUDemo.java
similarity index 98%
rename from router/java/test/junit/net/i2p/router/SSUDemo.java
rename to router/java/test/junit/net/i2p/router/transport/SSUDemo.java
index 485529d229f95456445a8635294eb5b822508528..534d6457c163bf822b9e0e832bf0396d9a850018 100644
--- a/router/java/test/junit/net/i2p/router/SSUDemo.java
+++ b/router/java/test/junit/net/i2p/router/transport/SSUDemo.java
@@ -28,6 +28,7 @@ public class SSUDemo {
 
     public static void main(String args[]) {
         boolean testNTCP = args.length > 0 && args[0].equals("ntcp");
+        System.out.println("Testing " + (testNTCP ? "NTCP" : "SSU"));
         SSUDemo demo = new SSUDemo();
         demo.run(testNTCP);
     }
@@ -38,10 +39,12 @@ public class SSUDemo {
         String cfgFile = "router.config";
         Properties envProps = getEnv(testNTCP);
         Router r = new Router(cfgFile, envProps);
+        System.out.println("Starting router...");
         r.runRouter();
         _us = r.getContext();
         setupHandlers();
         // wait for it to warm up a bit
+        System.out.println("30 second warmup...");
         try { Thread.sleep(30*1000); } catch (InterruptedException ie) {}
         // now write out our ident and info
         RouterInfo myInfo = _us.router().getRouterInfo();
@@ -60,8 +63,7 @@ public class SSUDemo {
         else
             envProps.setProperty("i2np.ntcp.enable", "false");
         envProps.setProperty("i2np.upnp.enable", "false");
-        // we want SNTP synchronization for replay prevention
-        envProps.setProperty("time.disabled", "false");
+        envProps.setProperty("time.disabled", "true");
         // allow 127.0.0.1/10.0.0.1/etc (useful for testing).  If this is false,
         // peers who say they're on an invalid IP are banlisted
         envProps.setProperty("i2np.allowLocal", "true");
diff --git a/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java b/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java
index 0c3139eba4dc8b5f210e1ef6a05ed134a6ba51ff..f352d2e337cb3d30e270e4c9c613db3018fd599e 100644
--- a/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java
+++ b/router/java/test/junit/net/i2p/router/tunnel/OutboundTest.java
@@ -46,6 +46,10 @@ public class OutboundTest extends TestCase{
         }
         
         boolean eq = DataHelper.eq(orig, 16, message, 16, orig.length - 16);
+        if (!eq) {
+            System.out.println("Orig:\n" + net.i2p.util.HexDump.dump(orig, 16, orig.length - 16));
+            System.out.println("Rcvd:\n" + net.i2p.util.HexDump.dump(message, 16, orig.length - 16));
+        }
         assertTrue(eq);
     }