diff --git a/src/host-storage.c b/src/host-storage.c
index db7bd40bc5..7b03fcda3c 100644
--- a/src/host-storage.c
+++ b/src/host-storage.c
@@ -123,6 +123,7 @@ static void StorageTestFree(void *x)
 
 static int HostStorageTest01(void)
 {
+    StorageCleanup();
     StorageInit();
 
     HostStorageId id1 = HostStorageRegister("test", 8, StorageTestAlloc, StorageTestFree);
@@ -203,6 +204,7 @@ error:
 
 static int HostStorageTest02(void)
 {
+    StorageCleanup();
     StorageInit();
 
     HostStorageId id1 = HostStorageRegister("test", sizeof(void *), NULL, StorageTestFree);
@@ -253,6 +255,7 @@ error:
 
 static int HostStorageTest03(void)
 {
+    StorageCleanup();
     StorageInit();
 
     HostStorageId id1 = HostStorageRegister("test1", sizeof(void *), NULL, StorageTestFree);