diff --git a/accounts/pkg/indexer/index/cs3/unique_test.go b/accounts/pkg/indexer/index/cs3/unique_test.go
index ca6b76af63..c124b054e9 100644
--- a/accounts/pkg/indexer/index/cs3/unique_test.go
+++ b/accounts/pkg/indexer/index/cs3/unique_test.go
@@ -1,38 +1,17 @@
 package cs3
 
 import (
-	"context"
-	"flag"
 	"os"
 	"path"
 	"testing"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/indexer/option"
 	. "github.com/owncloud/ocis/accounts/pkg/indexer/test"
-	"github.com/owncloud/ocis/storage/pkg/command"
-	mcfg "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/stretchr/testify/assert"
 )
 
-func init() {
-	go setupMetadataStorage()
-}
-
-func setupMetadataStorage() {
-	cfg := mcfg.New()
-	app := cli.App{
-		Name:     "storage-metadata-for-tests",
-		Commands: []*cli.Command{command.StorageMetadata(cfg)},
-	}
-
-	_ = app.Command("storage-metadata").Run(cli.NewContext(&app, &flag.FlagSet{}, &cli.Context{Context: context.Background()}))
-}
-
 func TestCS3UniqueIndex_FakeSymlink(t *testing.T) {
-	//go setupMetadataStorage()
-
 	dataDir := WriteIndexTestDataCS3(t,Data, "Id")
 	cfg := config.Config{
 		Repo: config.Repo{
@@ -79,13 +58,9 @@ func TestCS3UniqueIndex_FakeSymlink(t *testing.T) {
 	assert.Equal(t, searchRes[0], "abcdefg-123")
 
 	_ = os.RemoveAll(dataDir)
-
-	//cancelFunc()
 }
 
 func TestCS3UniqueIndexSearch(t *testing.T) {
-	//go setupMetadataStorage()
-
 	dataDir := WriteIndexTestDataCS3(t, Data, "Id")
 	cfg := config.Config{
 		Repo: config.Repo{
@@ -126,6 +101,4 @@ func TestCS3UniqueIndexSearch(t *testing.T) {
 	t.Log(res)
 
 	_ = os.RemoveAll(dataDir)
-
-	//cancelFunc()
 }
diff --git a/accounts/pkg/indexer/test/test.go b/accounts/pkg/indexer/test/test.go
new file mode 100644
index 0000000000..5a131e71d2
--- /dev/null
+++ b/accounts/pkg/indexer/test/test.go
@@ -0,0 +1,23 @@
+package test
+
+import (
+	"context"
+	"flag"
+	"github.com/micro/cli/v2"
+	"github.com/owncloud/ocis/storage/pkg/command"
+	mcfg "github.com/owncloud/ocis/storage/pkg/config"
+)
+
+func init() {
+	go setupMetadataStorage()
+}
+
+func setupMetadataStorage() {
+	cfg := mcfg.New()
+	app := cli.App{
+		Name:     "storage-metadata-for-tests",
+		Commands: []*cli.Command{command.StorageMetadata(cfg)},
+	}
+
+	_ = app.Command("storage-metadata").Run(cli.NewContext(&app, &flag.FlagSet{}, &cli.Context{Context: context.Background()}))
+}