diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
similarity index 98%
rename from broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
rename to broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
index bba6b3d1..29300c68 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
@@ -14,6 +14,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.dna.mqtt.moquette.messaging.spi.impl.HawtDBStorageService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;