diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 772a97b8cf..a954e14deb 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -177,11 +177,6 @@
     </dependency>
 
     <!-- for XML parsing -->
-    <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-spring</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -204,6 +199,12 @@
     <!-- =============================== -->
     <!-- Testing Dependencies            -->
     <!-- =============================== -->
+    <dependency>
+       <groupId>org.apache.xbean</groupId>
+       <artifactId>xbean-spring</artifactId>
+       <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-broker</artifactId>
diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java
index 9029cef129..09e496e943 100644
--- a/activemq-core/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.java
@@ -75,11 +75,11 @@ public class ConnectionHangOnStartupTest {
     }
 
     protected String getSlaveXml() {
-        return "org/apache/activemq/broker/ft/slave.xml";
+        return "org/apache/activemq/broker/ft/sharedFileSlave.xml";
     }
 
     protected String getMasterXml() {
-        return "org/apache/activemq/broker/ft/master.xml";
+        return "org/apache/activemq/broker/ft/sharedFileMaster.xml";
     }
 
     @Test(timeout=60000)
@@ -101,7 +101,8 @@ public class ConnectionHangOnStartupTest {
         };
         t.start();
         createMaster();
-        createSlave();
+        // slave will never start unless the master dies!
+        //createSlave();
 
         conn.get().stop();
     }