diff --git a/apps/sam/java/test/net/i2p/sam/TestCreateSessionStream.java b/apps/sam/java/test/net/i2p/sam/TestCreateSessionStream.java
new file mode 100644
index 000000000..0d2e07399
--- /dev/null
+++ b/apps/sam/java/test/net/i2p/sam/TestCreateSessionStream.java
@@ -0,0 +1,78 @@
+package net.i2p.sam;
+
+import java.io.IOException;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import net.i2p.util.Log;
+
+public class TestCreateSessionStream {
+    private static Log _log = new Log(TestCreateSessionStream.class);
+    
+    private static void runTest(String samHost, int samPort, String conOptions) {
+        testTransient(samHost, samPort, conOptions);
+        testNewDest(samHost, samPort, conOptions);
+        testOldDest(samHost, samPort, conOptions);
+    }
+    
+    private static void testTransient(String host, int port, String conOptions) {
+        testDest(host, port, conOptions, "TRANSIENT");
+        _log.debug("\n\nTest of transient complete\n\n\n");
+        try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
+    }
+    private static void testNewDest(String host, int port, String conOptions) {
+        String destName = "Alice" + Math.random();
+        testDest(host, port, conOptions, destName);
+    }
+    private static void testOldDest(String host, int port, String conOptions) {
+        String destName = "Alice" + Math.random();
+        testDest(host, port, conOptions, destName);
+        _log.debug("\n\nTest of initial contact for " + destName + " complete, waiting 90 seconds");
+        try { Thread.sleep(90*1000); } catch (InterruptedException ie) {}
+        _log.debug("now testing subsequent contact\n\n\n");
+        testDest(host, port, conOptions, destName);
+        _log.debug("\n\nTest of subsequent contact complete\n\n");
+    }
+    
+    private static void testDest(String host, int port, String conOptions, String destName) {
+        _log.info("\n\nTesting creating a new destination (should come back with 'SESSION STATUS RESULT=OK DESTINATION=someName)\n\n\n");
+        try {
+            Socket s = new Socket(host, port);
+            OutputStream out = s.getOutputStream();
+            out.write("HELLO VERSION MIN=1.0 MAX=1.0\n".getBytes());
+            BufferedReader reader = new BufferedReader(new InputStreamReader(s.getInputStream()));
+            String line = reader.readLine();
+            _log.debug("line read for valid version: " + line);
+            String req = "SESSION CREATE STYLE=STREAM DESTINATION=" + destName + " " + conOptions + "\n";
+            out.write(req.getBytes());
+            line = reader.readLine();
+            _log.info("Response to creating the session with destination " + destName + ": " + line);
+            _log.debug("The above should contain SESSION STATUS RESULT=OK\n\n\n");
+            try { Thread.sleep(5*1000); } catch (InterruptedException ie) {}
+            s.close();
+        } catch (Exception e) {
+            _log.error("Error testing for valid version", e);
+        }
+    }
+    
+    public static void main(String args[]) {
+        // "i2cp.tcp.host=www.i2p.net i2cp.tcp.port=7765";
+        // "i2cp.tcp.host=localhost i2cp.tcp.port=7654 tunnels.inboundDepth=0"; 
+        String conOptions = "i2cp.tcp.host=localhost i2cp.tcp.port=7654 tunnels.inboundDepth=0";
+        if (args.length > 0) {
+            conOptions = "";
+            for (int i = 0; i < args.length; i++)
+                conOptions = conOptions + " " + args[i];
+        }
+        try {
+            TestUtil.startupBridge(6000);
+            runTest("localhost", 6000, conOptions);
+        } catch (Throwable t) {
+            _log.error("Error running test", t);
+        }
+        try { Thread.sleep(5*1000); } catch (InterruptedException ie) {}
+        System.exit(0);
+    }
+}
\ No newline at end of file
diff --git a/apps/sam/java/test/net/i2p/sam/TestHello.java b/apps/sam/java/test/net/i2p/sam/TestHello.java
new file mode 100644
index 000000000..1e1417699
--- /dev/null
+++ b/apps/sam/java/test/net/i2p/sam/TestHello.java
@@ -0,0 +1,76 @@
+package net.i2p.sam;
+
+import java.io.IOException;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import net.i2p.util.Log;
+
+public class TestHello {
+    private static Log _log = new Log(TestHello.class);
+    
+    private static void runTest(String samHost, int samPort) {
+        testValidVersion(samHost, samPort);
+        testInvalidVersion(samHost, samPort);
+        testCorruptLine(samHost, samPort);
+    }
+    
+    private static void testValidVersion(String host, int port) {
+        _log.info("\n\nTesting valid version (should come back with an OK)\n\n\n");
+        try {
+            Socket s = new Socket(host, port);
+            OutputStream out = s.getOutputStream();
+            out.write("HELLO VERSION MIN=1.0 MAX=1.0\n".getBytes());
+            BufferedReader reader = new BufferedReader(new InputStreamReader(s.getInputStream()));
+            String line = reader.readLine();
+            _log.info("line read for valid version: " + line);
+            s.close();
+        } catch (Exception e) {
+            _log.error("Error testing for valid version", e);
+        }
+    }
+    
+    private static void testInvalidVersion(String host, int port) {
+        _log.info("\n\nTesting invalid version (should come back with an error)\n\n\n");
+        try {
+            Socket s = new Socket(host, port);
+            OutputStream out = s.getOutputStream();
+            out.write("HELLO VERSION MIN=9.0 MAX=8.3\n".getBytes());
+            BufferedReader reader = new BufferedReader(new InputStreamReader(s.getInputStream()));
+            String line = reader.readLine();
+            _log.info("line read for invalid version: " + line);
+            s.close();
+        } catch (Exception e) {
+            _log.error("Error testing for valid version", e);
+        }
+    }
+        
+    private static void testCorruptLine(String host, int port) {
+        _log.info("\n\nTesting corrupt line (should come back with an error)\n\n\n");
+        try {
+            Socket s = new Socket(host, port);
+            OutputStream out = s.getOutputStream();
+            out.write("HELLO h0 h0 h0\n".getBytes());
+            BufferedReader reader = new BufferedReader(new InputStreamReader(s.getInputStream()));
+            String line = reader.readLine();
+            _log.info("line read for valid version: " + line);
+            s.close();
+        } catch (Exception e) {
+            _log.error("Error testing for valid version", e);
+        }
+    }
+
+    
+    public static void main(String args[]) {
+        try {
+            TestUtil.startupBridge(6000);
+            runTest("localhost", 6000);
+        } catch (Throwable t) {
+            _log.error("Error running test", t);
+        }
+        try { Thread.sleep(5*1000); } catch (InterruptedException ie) {}
+        System.exit(0);
+    }
+}
\ No newline at end of file
diff --git a/apps/sam/java/test/net/i2p/sam/TestUtil.java b/apps/sam/java/test/net/i2p/sam/TestUtil.java
new file mode 100644
index 000000000..e844b501c
--- /dev/null
+++ b/apps/sam/java/test/net/i2p/sam/TestUtil.java
@@ -0,0 +1,9 @@
+package net.i2p.sam;
+
+
+public class TestUtil {
+    public static void startupBridge(int listenPort) {
+        // Usage: SAMBridge [listenHost listenPortNum[ name=val]*]
+        SAMBridge.main(new String[] { "0.0.0.0", listenPort+"" });
+    }
+}
\ No newline at end of file