diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/security/JaasDualAuthenticationNetworkBridgeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/security/JaasDualAuthenticationNetworkBridgeTest.java
index 30b260f99f..e6dd562a5a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/security/JaasDualAuthenticationNetworkBridgeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/security/JaasDualAuthenticationNetworkBridgeTest.java
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
  * - ssl-domain-JaasDualAuthenticationNetworkBridgeTest.properties
  */
 public class JaasDualAuthenticationNetworkBridgeTest {
-    protected final static String CONFIG_FILE="org/apache/activemq/security/JaasDualAuthenticationNetworkBridgeTest.xml";
+    protected final static String CONFIG_FILE="org/apache/activemq/security/JaasDualAuthenticationNetworkBridge.xml";
     protected static Logger LOG = LoggerFactory.getLogger(JaasDualAuthenticationNetworkBridgeTest.class);
     private BrokerService broker1 = null;
     private BrokerService broker2 = null;
@@ -62,7 +62,7 @@ public class JaasDualAuthenticationNetworkBridgeTest {
     public void setUp() throws Exception {
         LOG.info("Starting up");
         String path = null;
-        URL resource = JaasDualAuthenticationNetworkBridgeTest.class.getClassLoader().getResource("login-JaasDualAuthenticationNetworkBridgeTest.config");
+        URL resource = JaasDualAuthenticationNetworkBridgeTest.class.getClassLoader().getResource("login-JaasDualAuthenticationNetworkBridge.config");
         if (resource != null) {
             path = resource.getFile();
             System.setProperty("java.security.auth.login.config", path);
diff --git a/activemq-unit-tests/src/test/resources/groups-JaasDualAuthenticationNetworkBridgeTest.properties b/activemq-unit-tests/src/test/resources/groups-JaasDualAuthenticationNetworkBridge.properties
similarity index 100%
rename from activemq-unit-tests/src/test/resources/groups-JaasDualAuthenticationNetworkBridgeTest.properties
rename to activemq-unit-tests/src/test/resources/groups-JaasDualAuthenticationNetworkBridge.properties
diff --git a/activemq-unit-tests/src/test/resources/login-JaasDualAuthenticationNetworkBridgeTest.config b/activemq-unit-tests/src/test/resources/login-JaasDualAuthenticationNetworkBridge.config
similarity index 87%
rename from activemq-unit-tests/src/test/resources/login-JaasDualAuthenticationNetworkBridgeTest.config
rename to activemq-unit-tests/src/test/resources/login-JaasDualAuthenticationNetworkBridge.config
index e45af41515..9c81b11774 100644
--- a/activemq-unit-tests/src/test/resources/login-JaasDualAuthenticationNetworkBridgeTest.config
+++ b/activemq-unit-tests/src/test/resources/login-JaasDualAuthenticationNetworkBridge.config
@@ -20,13 +20,13 @@ activemq-domain {
 
     org.apache.activemq.jaas.PropertiesLoginModule requisite
         debug=true
-        org.apache.activemq.jaas.properties.user="users-JaasDualAuthenticationNetworkBridgeTest.properties"
-        org.apache.activemq.jaas.properties.group="groups-JaasDualAuthenticationNetworkBridgeTest.properties";
+        org.apache.activemq.jaas.properties.user="users-JaasDualAuthenticationNetworkBridge.properties"
+        org.apache.activemq.jaas.properties.group="groups-JaasDualAuthenticationNetworkBridge.properties";
 };
 
 activemq-ssl-domain {
     org.apache.activemq.jaas.TextFileCertificateLoginModule required
         debug=true
-        org.apache.activemq.jaas.textfiledn.user="ssl-domain-JaasDualAuthenticationNetworkBridgeTest.properties"
-        org.apache.activemq.jaas.textfiledn.group="groups-JaasDualAuthenticationNetworkBridgeTest.properties";
+        org.apache.activemq.jaas.textfiledn.user="ssl-domain-JaasDualAuthenticationNetworkBridge.properties"
+        org.apache.activemq.jaas.textfiledn.group="groups-JaasDualAuthenticationNetworkBridge.properties";
 };
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/security/JaasDualAuthenticationNetworkBridgeTest.xml b/activemq-unit-tests/src/test/resources/org/apache/activemq/security/JaasDualAuthenticationNetworkBridge.xml
similarity index 100%
rename from activemq-unit-tests/src/test/resources/org/apache/activemq/security/JaasDualAuthenticationNetworkBridgeTest.xml
rename to activemq-unit-tests/src/test/resources/org/apache/activemq/security/JaasDualAuthenticationNetworkBridge.xml
diff --git a/activemq-unit-tests/src/test/resources/ssl-domain-JaasDualAuthenticationNetworkBridgeTest.properties b/activemq-unit-tests/src/test/resources/ssl-domain-JaasDualAuthenticationNetworkBridge.properties
similarity index 100%
rename from activemq-unit-tests/src/test/resources/ssl-domain-JaasDualAuthenticationNetworkBridgeTest.properties
rename to activemq-unit-tests/src/test/resources/ssl-domain-JaasDualAuthenticationNetworkBridge.properties
diff --git a/activemq-unit-tests/src/test/resources/users-JaasDualAuthenticationNetworkBridgeTest.properties b/activemq-unit-tests/src/test/resources/users-JaasDualAuthenticationNetworkBridge.properties
similarity index 100%
rename from activemq-unit-tests/src/test/resources/users-JaasDualAuthenticationNetworkBridgeTest.properties
rename to activemq-unit-tests/src/test/resources/users-JaasDualAuthenticationNetworkBridge.properties