diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
index c530ab783c..0de77f7b74 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
@@ -20,6 +20,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -241,6 +242,10 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
          String scheme = uri.getScheme();
          if ("vm".equals(scheme)) {
              Map<String, String> params = URISupport.parseParameters(uri);
+             //EMPTY_MAP is immutable, so use a normal map instead.
+             if (params == Collections.EMPTY_MAP) {
+                 params = new HashMap<String, String>();
+             }
              params.put("invmBrokerId", uri.getHost() == null ? "localhost" : uri.getHost());
              defaultTcpUri = URISupport.createRemainingURI(defaultTcpUri, params);
              return defaultTcpUri;
diff --git a/tests/activemq5-unit-tests/src/test/java/client.keystore b/tests/activemq5-unit-tests/src/test/java/client.keystore
old mode 100644
new mode 100755
index e69de29bb2..a96e55c3d4
Binary files a/tests/activemq5-unit-tests/src/test/java/client.keystore and b/tests/activemq5-unit-tests/src/test/java/client.keystore differ
diff --git a/tests/activemq5-unit-tests/src/test/java/dummy.keystore b/tests/activemq5-unit-tests/src/test/java/dummy.keystore
index e69de29bb2..9f705e5c28 100644
Binary files a/tests/activemq5-unit-tests/src/test/java/dummy.keystore and b/tests/activemq5-unit-tests/src/test/java/dummy.keystore differ
diff --git a/tests/activemq5-unit-tests/src/test/java/server.keystore b/tests/activemq5-unit-tests/src/test/java/server.keystore
old mode 100644
new mode 100755
index e69de29bb2..0d549fc03c
Binary files a/tests/activemq5-unit-tests/src/test/java/server.keystore and b/tests/activemq5-unit-tests/src/test/java/server.keystore differ
diff --git a/tests/activemq5-unit-tests/src/test/resources/client.keystore b/tests/activemq5-unit-tests/src/test/resources/client.keystore
index e69de29bb2..a96e55c3d4 100755
Binary files a/tests/activemq5-unit-tests/src/test/resources/client.keystore and b/tests/activemq5-unit-tests/src/test/resources/client.keystore differ
diff --git a/tests/activemq5-unit-tests/src/test/resources/dummy.keystore b/tests/activemq5-unit-tests/src/test/resources/dummy.keystore
index e69de29bb2..9f705e5c28 100644
Binary files a/tests/activemq5-unit-tests/src/test/resources/dummy.keystore and b/tests/activemq5-unit-tests/src/test/resources/dummy.keystore differ
diff --git a/tests/activemq5-unit-tests/src/test/resources/server.keystore b/tests/activemq5-unit-tests/src/test/resources/server.keystore
index e69de29bb2..0d549fc03c 100755
Binary files a/tests/activemq5-unit-tests/src/test/resources/server.keystore and b/tests/activemq5-unit-tests/src/test/resources/server.keystore differ