diff --git a/activemq-optional/project.xml b/activemq-optional/project.xml
index 53530fa221..4bbc1fae36 100755
--- a/activemq-optional/project.xml
+++ b/activemq-optional/project.xml
@@ -196,9 +196,6 @@
         <exclude>**/HttpsTransportBrokerTest.*</exclude>
         <exclude>**/HttpTransportBrokerTest.*</exclude>
 
-        <!-- http://jira.activemq.org/jira/browse/AMQ-629 -->
-        <exclude>**/SslTransportBrokerTest.*</exclude>
-
       </excludes>
     </unitTest>
 
diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/ssl/SslTransportBrokerTest.java b/activemq-optional/src/test/java/org/apache/activemq/transport/ssl/SslTransportBrokerTest.java
index b468a8b4be..089b2b2efb 100755
--- a/activemq-optional/src/test/java/org/apache/activemq/transport/ssl/SslTransportBrokerTest.java
+++ b/activemq-optional/src/test/java/org/apache/activemq/transport/ssl/SslTransportBrokerTest.java
@@ -28,10 +28,10 @@ public class SslTransportBrokerTest extends TransportBrokerTestSupport {
     }
 
     protected void setUp() throws Exception {
-        System.setProperty("javax.net.ssl.trustStore", "src/test/client.keystore");
+        System.setProperty("javax.net.ssl.trustStore", "src/test/resources/client.keystore");
         System.setProperty("javax.net.ssl.trustStorePassword", "password");
         System.setProperty("javax.net.ssl.trustStoreType", "jks");        
-        System.setProperty("javax.net.ssl.keyStore", "src/test/server.keystore");
+        System.setProperty("javax.net.ssl.keyStore", "src/test/resources/server.keystore");
         System.setProperty("javax.net.ssl.keyStorePassword", "password");
         System.setProperty("javax.net.ssl.keyStoreType", "jks");        
         //System.setProperty("javax.net.debug", "ssl,handshake,data,trustmanager");