diff --git a/client/storage/liststorage_test.go b/client/storage/liststorage_test.go
index 4d8cf9b5..c6ac8225 100644
--- a/client/storage/liststorage_test.go
+++ b/client/storage/liststorage_test.go
@@ -43,6 +43,17 @@ func TestListStorage(t *testing.T) {
 		return nil
 	})
 
+	t.Run("create same storage returns no error", func(t *testing.T) {
+		fx.db.View(func(txn *badger.Txn) error {
+			// this is ok, because we only create new list storage when we create space storage
+			listStore, err := createListStorage(spaceId, fx.db, txn, aclRoot)
+			require.NoError(t, err)
+			testListInDB(t, listStore, aclRoot, aclRoot.Id)
+
+			return nil
+		})
+	})
+
 	t.Run("set head", func(t *testing.T) {
 		head := "newHead"
 		require.NoError(t, listStore.SetHead(head))
diff --git a/client/storage/spacestorage_test.go b/client/storage/spacestorage_test.go
index b8a51c7a..fb099365 100644
--- a/client/storage/spacestorage_test.go
+++ b/client/storage/spacestorage_test.go
@@ -42,11 +42,14 @@ func TestSpaceStorage_Create(t *testing.T) {
 	payload := spaceTestPayload()
 	store, err := createSpaceStorage(fx.db, payload)
 	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, store.Close())
-	}()
 
 	testSpaceInDB(t, store, payload)
+	require.NoError(t, store.Close())
+
+	t.Run("create same storage returns error", func(t *testing.T) {
+		_, err := createSpaceStorage(fx.db, payload)
+		require.Error(t, err)
+	})
 }
 
 func TestSpaceStorage_NewAndCreateTree(t *testing.T) {
@@ -103,4 +106,3 @@ func TestSpaceStorage_StoredIds(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, ids, storedIds)
 }
-
diff --git a/client/storage/treestorage_test.go b/client/storage/treestorage_test.go
index fd6062cd..d0fdab35 100644
--- a/client/storage/treestorage_test.go
+++ b/client/storage/treestorage_test.go
@@ -71,6 +71,11 @@ func TestTreeStorage_Create(t *testing.T) {
 	store, err := createTreeStorage(fx.db, spaceId, payload)
 	require.NoError(t, err)
 	testTreePayloadInDB(t, store, payload)
+
+	t.Run("create same storage returns error", func(t *testing.T) {
+		_, err := createTreeStorage(fx.db, spaceId, payload)
+		require.Error(t, err)
+	})
 }
 
 func TestTreeStorage_Methods(t *testing.T) {
diff --git a/node/storage/liststorage_test.go b/node/storage/liststorage_test.go
index ad6371ab..cd563837 100644
--- a/node/storage/liststorage_test.go
+++ b/node/storage/liststorage_test.go
@@ -29,6 +29,13 @@ func TestListStorage_Create(t *testing.T) {
 	listStore, err := createListStorage(fx.db, aclRoot)
 	require.NoError(t, err)
 	testListInDB(t, listStore, aclRoot, aclRoot.Id)
+
+	t.Run("create same list storage returns nil", func(t *testing.T) {
+		// this is ok, because we only create new list storage when we create space storage
+		listStore, err := createListStorage(fx.db, aclRoot)
+		require.NoError(t, err)
+		testListInDB(t, listStore, aclRoot, aclRoot.Id)
+	})
 }
 
 func TestListStorage_Methods(t *testing.T) {
diff --git a/node/storage/spacestorage_test.go b/node/storage/spacestorage_test.go
index 562185ca..ad29b0a7 100644
--- a/node/storage/spacestorage_test.go
+++ b/node/storage/spacestorage_test.go
@@ -42,11 +42,14 @@ func TestSpaceStorage_Create(t *testing.T) {
 	payload := spaceTestPayload()
 	store, err := createSpaceStorage(dir, payload)
 	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, store.Close())
-	}()
 
 	testSpaceInDB(t, store, payload)
+	require.NoError(t, store.Close())
+
+	t.Run("create same storage returns error", func(t *testing.T) {
+		_, err := createSpaceStorage(dir, payload)
+		require.Error(t, err)
+	})
 }
 
 func TestSpaceStorage_NewAndCreateTree(t *testing.T) {
@@ -97,7 +100,7 @@ func TestSpaceStorage_StoredIds(t *testing.T) {
 		_, err := store.CreateTreeStorage(treePayload)
 		require.NoError(t, err)
 	}
-	
+
 	storedIds, err := store.StoredIds()
 	require.NoError(t, err)
 	require.Equal(t, ids, storedIds)
diff --git a/node/storage/treestorage_test.go b/node/storage/treestorage_test.go
index c063a97e..b0f3855b 100644
--- a/node/storage/treestorage_test.go
+++ b/node/storage/treestorage_test.go
@@ -70,6 +70,11 @@ func TestTreeStorage_Create(t *testing.T) {
 	store, err := createTreeStorage(fx.db, payload)
 	require.NoError(t, err)
 	testTreePayloadInDB(t, store, payload)
+
+	t.Run("create same storage returns error", func(t *testing.T) {
+		_, err := createTreeStorage(fx.db, payload)
+		require.Error(t, err)
+	})
 }
 
 func TestTreeStorage_Methods(t *testing.T) {