diff --git a/broker/src/test/java/io/moquette/integration/ConfigurationClassLoaderTest.java b/broker/src/test/java/io/moquette/integration/ConfigurationClassLoaderTest.java
index 76afc730..236e3c2f 100644
--- a/broker/src/test/java/io/moquette/integration/ConfigurationClassLoaderTest.java
+++ b/broker/src/test/java/io/moquette/integration/ConfigurationClassLoaderTest.java
@@ -17,17 +17,19 @@
 package io.moquette.integration;
 
 import io.moquette.BrokerConstants;
+import io.moquette.broker.Server;
 import io.moquette.broker.config.IConfig;
 import io.moquette.broker.config.MemoryConfig;
-import io.moquette.broker.subscriptions.Topic;
 import io.moquette.broker.security.IAuthenticator;
 import io.moquette.broker.security.IAuthorizatorPolicy;
-import io.moquette.broker.Server;
+import io.moquette.broker.subscriptions.Topic;
 import org.junit.After;
 import org.junit.Test;
+
 import java.io.IOException;
 import java.util.Properties;
-import static org.junit.Assert.*;
+
+import static org.junit.Assert.assertTrue;
 
 public class ConfigurationClassLoaderTest implements IAuthenticator, IAuthorizatorPolicy {
 
@@ -61,16 +63,6 @@ public class ConfigurationClassLoaderTest implements IAuthenticator, IAuthorizat
         assertTrue(true);
     }
 
-//    @Test
-//    public void loadStorage() throws Exception {
-//        Properties props = new Properties(IntegrationUtils.prepareTestProperties());
-//        props.setProperty(BrokerConstants.STORAGE_CLASS_NAME, MemoryStorageService.class.getName());
-//
-//        startServer(props);
-//        assertTrue(m_server.getProcessor().getMessagesStore() instanceof MemoryMessagesStore);
-//        assertTrue(m_server.getProcessor().getSessionsStore() instanceof MemorySessionStore);
-//    }
-
     @Override
     public boolean checkValid(String clientID, String username, byte[] password) {
         return true;
diff --git a/broker/src/test/java/io/moquette/integration/IntegrationUtils.java b/broker/src/test/java/io/moquette/integration/IntegrationUtils.java
index 70d04ac6..ec4f8754 100644
--- a/broker/src/test/java/io/moquette/integration/IntegrationUtils.java
+++ b/broker/src/test/java/io/moquette/integration/IntegrationUtils.java
@@ -30,7 +30,7 @@ public final class IntegrationUtils {
 
     static String localH2MvStoreDBPath() {
         String currentDir = System.getProperty("user.dir");
-        return currentDir + File.separator + "target" + File.separator + DEFAULT_MOQUETTE_STORE_H2_DB_FILENAME;
+        return currentDir + File.separator + "out" + File.separator + DEFAULT_MOQUETTE_STORE_H2_DB_FILENAME;
     }
 
     public static Properties prepareTestProperties() {
diff --git a/distribution/src/main/resources/moquette.conf b/distribution/src/main/resources/moquette.conf
index abd2661b..dd83b0da 100644
--- a/distribution/src/main/resources/moquette.conf
+++ b/distribution/src/main/resources/moquette.conf
@@ -52,9 +52,7 @@ host 0.0.0.0
 # The file for the persistent store, if not specified, use just memory
 # no physical persistence
 #*********************************************************************
-#persistent_store ./moquette_store.mapdb
-#storage_class io.moquette.persistence.h2.H2PersistentStore
-#storage_class io.moquette.persistence.mapdb.MapDBPersistentStore
+#persistent_store ./moquette_store.h2
 
 #*********************************************************************
 # acl_file: