diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageServiceTest.java b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageServiceTest.java
index 5e872195..9519a4f4 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageServiceTest.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageServiceTest.java
@@ -29,6 +29,10 @@ public class HawtDBStorageServiceTest {
 
     @After
     public void tearDown() {
+        if (m_storageService != null) {
+            m_storageService.close();
+        }
+        
         File dbFile = new File(Server.STORAGE_FILE_PATH);
         if (dbFile.exists()) {
             dbFile.delete();