1 files changed, 6 insertions, 3 deletions
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
index 1747588bf1..859fad629b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
@@ -22,11 +22,14 @@ package org.apache.qpid.server.store.derby;
 
 import java.io.File;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.MessageStoreTestCase;
 import org.apache.qpid.util.FileUtils;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.when;
+
 public class DerbyMessageStoreTest extends MessageStoreTestCase
 {
     private String _storeLocation;
@@ -57,10 +60,10 @@ public class DerbyMessageStoreTest extends MessageStoreTestCase
     }
 
     @Override
-    protected void setUpStoreConfiguration(Configuration storeConfiguration) throws Exception
+    protected void setUpStoreConfiguration(VirtualHost virtualHost) throws Exception
     {
         _storeLocation = TMP_FOLDER + File.separator + getTestName();
-        storeConfiguration.setProperty("environment-path", _storeLocation);
+        when(virtualHost.getAttribute(eq(VirtualHost.STORE_PATH))).thenReturn(_storeLocation);
         deleteStoreIfExists();
     }