diff --git a/activemq-core/src/test/java/org/activemq/EmbeddedBrokerTestSupport.java b/activemq-core/src/test/java/org/activemq/EmbeddedBrokerTestSupport.java
index f1169b54a0..7383cd6db9 100644
--- a/activemq-core/src/test/java/org/activemq/EmbeddedBrokerTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/EmbeddedBrokerTestSupport.java
@@ -38,7 +38,8 @@ import junit.framework.TestCase;
 public class EmbeddedBrokerTestSupport extends TestCase {
 
     protected BrokerService broker;
-    protected String bindAddress = "tcp://localhost:61616";
+    //protected String bindAddress = "tcp://localhost:61616";
+    protected String bindAddress = "vm://localhost";
     protected ConnectionFactory connectionFactory;
     protected boolean useTopic = false;
     protected Destination destination;
@@ -127,10 +128,18 @@ public class EmbeddedBrokerTestSupport extends TestCase {
      */
     protected BrokerService createBroker() throws Exception {
         BrokerService answer = new BrokerService();
+        answer.setPersistent(isPersistent());
         answer.addConnector(bindAddress);
         return answer;
     }
 
+    /**
+     * @return whether or not persistence should be used
+     */
+    protected boolean isPersistent() {
+        return false;
+    }
+
     /**
      * Factory method to create a new connection
      */