diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ExpiryHogTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ExpiryHogTest.java
index eff6efa802..a07ee1e681 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ExpiryHogTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ExpiryHogTest.java
@@ -23,7 +23,6 @@ import javax.jms.TextMessage;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
-import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -58,8 +57,6 @@ public class ExpiryHogTest extends JmsMultipleClientsTestSupport {
         policyMap.setDefaultEntry(defaultEntry);
         bs.setDestinationPolicy(policyMap);
 
-        KahaDBPersistenceAdapter ad = (KahaDBPersistenceAdapter) bs.getPersistenceAdapter();
-        ad.setConcurrentStoreAndDispatchQueues(true);
         return bs;
     }
 
diff --git a/tests/activemq5-unit-tests/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin b/tests/activemq5-unit-tests/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin
new file mode 100644
index 0000000000..958806924f
Binary files /dev/null and b/tests/activemq5-unit-tests/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin differ
diff --git a/tests/activemq5-unit-tests/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin b/tests/activemq5-unit-tests/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin
new file mode 100644
index 0000000000..101210613c
Binary files /dev/null and b/tests/activemq5-unit-tests/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin differ