diff --git a/tests/src/joram/ssl/Test.java b/tests/src/joram/ssl/Test.java
index ae1c33569edb3698bd6caeb727684df782bc1c64..86bf29f42a3ed72137bfd6f630ecad13cdecdfe5 100644
--- a/tests/src/joram/ssl/Test.java
+++ b/tests/src/joram/ssl/Test.java
@@ -52,10 +52,27 @@ public class Test extends TestCase {
   public void run() {
     try {
       System.out.println("server start");
-      startAgentServer((short) 0);
 
+      String serverks = System.getProperty("server.ks", "joram_ks");
+      String serverpass = System.getProperty("server.pass", "jorampass");
+      String clientauth = System.getProperty("client.auth", "NEED");
+      startAgentServer((short) 0,
+                       new String[] {"-Dorg.objectweb.joram.clientAuth=" + clientauth,
+                                     "-Dorg.objectweb.joram.keystore=" + serverks,
+                                     "-Dorg.objectweb.joram.keystorepass=" + serverpass});
       Thread.sleep(1000);
 
+      // Joram client and server use the same property names, so we have to overload these
+      // properties prior to create the Connection.
+      String clientks = System.getProperty("client.ks");
+      if (clientks != null)
+        System.setProperty("org.objectweb.joram.keystore", clientks);
+      String clientpass = System.getProperty("client.pass");
+      if (clientpass != null)
+        System.setProperty("org.objectweb.joram.keystorepass", clientpass);
+
+      System.out.println("ks=" + clientks + ", pass=" + clientpass);
+      
       admin();
       System.out.println("admin config ok");
 
@@ -99,7 +116,7 @@ public class Test extends TestCase {
 
   public void admin() throws Exception {
 
-    AdminModule.connect("root", "root", 60, "org.objectweb.joram.client.jms.tcp.ReliableSSLTcpClient");
+    AdminModule.connect("root", "root", 30, "org.objectweb.joram.client.jms.tcp.ReliableSSLTcpClient");
 
     Queue queue = Queue.create("queue");
     Topic topic = Topic.create("topic");
diff --git a/tests/src/joram/ssl/keystore_ca.jks b/tests/src/joram/ssl/keystore_ca.jks
new file mode 100644
index 0000000000000000000000000000000000000000..913a81927eb352e809f93d208b27e9f7bd5a86cb
Binary files /dev/null and b/tests/src/joram/ssl/keystore_ca.jks differ
diff --git a/tests/src/joram/ssl/keystore_clt.jks b/tests/src/joram/ssl/keystore_clt.jks
new file mode 100644
index 0000000000000000000000000000000000000000..126d2da1f478947e676a2c79958611a75dbab413
Binary files /dev/null and b/tests/src/joram/ssl/keystore_clt.jks differ
diff --git a/tests/src/joram/ssl/keystore_clt_ca.jks b/tests/src/joram/ssl/keystore_clt_ca.jks
new file mode 100644
index 0000000000000000000000000000000000000000..b05311443d8cf40c575c7dee5a93ec8ed7fc6f59
Binary files /dev/null and b/tests/src/joram/ssl/keystore_clt_ca.jks differ
diff --git a/tests/src/joram/ssl/keystore_srv.jks b/tests/src/joram/ssl/keystore_srv.jks
new file mode 100644
index 0000000000000000000000000000000000000000..be650d523063884774c9c5c7b5f3df7a03a03c90
Binary files /dev/null and b/tests/src/joram/ssl/keystore_srv.jks differ
diff --git a/tests/src/joram/ssl/keystore_srv_ca.jks b/tests/src/joram/ssl/keystore_srv_ca.jks
new file mode 100644
index 0000000000000000000000000000000000000000..dd1ecbc829eb86ccc4c7fc08350896dd527aab92
Binary files /dev/null and b/tests/src/joram/ssl/keystore_srv_ca.jks differ