diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/DummyStorageService.java b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
similarity index 96%
rename from broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/DummyStorageService.java
rename to broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
index cee54bbd..bba6b3d1 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/DummyStorageService.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
@@ -19,7 +19,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  */
-public class DummyStorageService implements IStorageService {
+public class MemoryStorageService implements IStorageService {
     
     private Map<String, Set<Subscription>> m_persistentSubscriptions = new HashMap<String, Set<Subscription>>();
     private Map<String, HawtDBStorageService.StoredMessage> m_retainedStore = new HashMap<String, HawtDBStorageService.StoredMessage>();
@@ -27,7 +27,7 @@ public class DummyStorageService implements IStorageService {
     private Map<String, PublishEvent> m_inflightStore = new HashMap<String, PublishEvent>();
     private Map<String, PublishEvent> m_qos2Store = new HashMap<String, PublishEvent>();
     
-    private static final Logger LOG = LoggerFactory.getLogger(DummyStorageService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MemoryStorageService.class);
     
     public void initStore() {
         //To change body of implemented methods use File | Settings | File Templates.
diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java
index 88e40325..b3d5e5bf 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java
@@ -74,7 +74,7 @@ public class ProtocolProcessorTest {
         //sleep to let the messaging batch processor to process the initEvent
         Thread.sleep(300);
         
-        m_storageService = new DummyStorageService();
+        m_storageService = new MemoryStorageService();
         //m_storageService.initStore();
 
         subscriptions = new SubscriptionsStore();
@@ -231,7 +231,7 @@ public class ProtocolProcessorTest {
                 }
             }
         };
-        subs.init(new DummyStorageService());
+        subs.init(new MemoryStorageService());
         
         //simulate a connect that register a clientID to an IoSession
         IMessaging mockedMessaging = mock(IMessaging.class);
diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java
index 6550d349..5cb4bab7 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java
@@ -6,7 +6,7 @@ import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
 
-import org.dna.mqtt.moquette.messaging.spi.impl.DummyStorageService;
+import org.dna.mqtt.moquette.messaging.spi.impl.MemoryStorageService;
 import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
 import org.fusesource.hawtdb.api.MultiIndexFactory;
 import org.fusesource.hawtdb.api.PageFile;
@@ -40,7 +40,7 @@ public class SubscriptionsStoreTest {
         pageFactory.open();
         PageFile pageFile = pageFactory.getPageFile();
         MultiIndexFactory multiIndexFactory = new MultiIndexFactory(pageFile);
-        store.init(new DummyStorageService());
+        store.init(new MemoryStorageService());
     }
     
     @After