diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java
new file mode 100644
index 0000000000..5f3a196096
--- /dev/null
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java
@@ -0,0 +1,117 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.nio;
+
+import junit.framework.TestCase;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.util.ConsumerThread;
+import org.apache.activemq.util.ProducerThread;
+import org.apache.activemq.util.Wait;
+import org.omg.CORBA.PUBLIC_MEMBER;
+
+import javax.jms.Connection;
+import javax.jms.Queue;
+import javax.jms.Session;
+
+public class NIOSSLLoadTest extends TestCase {
+
+    BrokerService broker;
+    Connection connection;
+    Session session;
+
+    public static final String KEYSTORE_TYPE = "jks";
+    public static final String PASSWORD = "password";
+    public static final String SERVER_KEYSTORE = "src/test/resources/server.keystore";
+    public static final String TRUST_KEYSTORE = "src/test/resources/client.keystore";
+
+    public static final int PRODUCER_COUNT = 10;
+    public static final int CONSUMER_COUNT = 10;
+    public static final int MESSAGE_COUNT = 1000;
+
+    final ConsumerThread[] consumers = new ConsumerThread[CONSUMER_COUNT];
+
+    @Override
+    protected void setUp() throws Exception {
+        System.setProperty("javax.net.ssl.trustStore", TRUST_KEYSTORE);
+        System.setProperty("javax.net.ssl.trustStorePassword", PASSWORD);
+        System.setProperty("javax.net.ssl.trustStoreType", KEYSTORE_TYPE);
+        System.setProperty("javax.net.ssl.keyStore", SERVER_KEYSTORE);
+        System.setProperty("javax.net.ssl.keyStoreType", KEYSTORE_TYPE);
+        System.setProperty("javax.net.ssl.keyStorePassword", PASSWORD);
+
+        broker = new BrokerService();
+        broker.setPersistent(false);
+        broker.setUseJmx(false);
+        TransportConnector connector = broker.addConnector("nio+ssl://localhost:0");
+        broker.start();
+        broker.waitUntilStarted();
+
+        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(connector.getConnectUri());
+        connection = factory.createConnection();
+        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        connection.start();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (connection != null) {
+            connection.close();
+        }
+
+        if (broker != null) {
+            broker.stop();
+            broker.waitUntilStopped();
+        }
+    }
+
+    public void testLoad() throws Exception {
+        Queue dest = session.createQueue("TEST");
+        for (int i = 0; i < PRODUCER_COUNT; i++) {
+            ProducerThread producer = new ProducerThread(session, dest);
+            producer.setMessageCount(MESSAGE_COUNT);
+            producer.start();
+        }
+
+        for (int i = 0; i < CONSUMER_COUNT; i++) {
+            ConsumerThread consumer = new ConsumerThread(session, dest);
+            consumer.setMessageCount(MESSAGE_COUNT);
+            consumer.start();
+            consumers[i] = consumer;
+        }
+
+        Wait.waitFor(new Wait.Condition() {
+            public boolean isSatisified() throws Exception {
+                return getReceived() == PRODUCER_COUNT * MESSAGE_COUNT;
+            }
+        }, 60000);
+
+        assertEquals(PRODUCER_COUNT * MESSAGE_COUNT, getReceived());
+
+    }
+
+    protected int getReceived() {
+        int received = 0;
+        for (ConsumerThread consumer : consumers) {
+            received += consumer.getReceived();
+        }
+        return received;
+    }
+
+}
diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLTransportBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLTransportBrokerTest.java
index 4860ec067d..65e38336a0 100644
--- a/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLTransportBrokerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLTransportBrokerTest.java
@@ -43,9 +43,9 @@ public class NIOSSLTransportBrokerTest extends TransportBrokerTestSupport {
         System.setProperty("javax.net.ssl.trustStorePassword", PASSWORD);
         System.setProperty("javax.net.ssl.trustStoreType", KEYSTORE_TYPE);        
         System.setProperty("javax.net.ssl.keyStore", SERVER_KEYSTORE);
+        System.setProperty("javax.net.ssl.keyStoreType", KEYSTORE_TYPE);
         System.setProperty("javax.net.ssl.keyStorePassword", PASSWORD);
-        System.setProperty("javax.net.ssl.keyStoreType", KEYSTORE_TYPE);        
-        //System.setProperty("javax.net.debug", "ssl,handshake,data,trustmanager");        
+        //System.setProperty("javax.net.debug", "ssl,handshake,data,trustmanager");
 
         maxWait = 10000;
         super.setUp();