diff --git a/.drone.star b/.drone.star
index 488f1b952..b628ee93b 100644
--- a/.drone.star
+++ b/.drone.star
@@ -231,6 +231,9 @@ def testing(ctx, module):
       }
   ]
 
+  if module == 'accounts':
+    steps = ocisMetadataStorage() + steps
+
   if config['modules'][module] == 'frontend':
     steps = frontend(module) + steps
 
@@ -253,6 +256,27 @@ def testing(ctx, module):
     },
   }
 
+def ocisMetadataStorage():
+  return [
+    {
+      'name': 'ocis-metadata-storage',
+      'image': 'webhippie/golang:1.14',
+      'pull': 'always',
+      'detach': True,
+      'commands': [
+        'mkdir -p /srv/app/tmp/ocis/owncloud/data/',
+        'mkdir -p /srv/app/tmp/ocis/storage/users/',
+        'ocis/bin/ocis storage-metadata'
+      ],
+      'volumes': [
+        {
+          'name': 'gopath',
+          'path': '/srv/app'
+        },
+      ]
+    },
+  ]
+
 def uploadCoverage(ctx):
   return {
     'kind': 'pipeline',
diff --git a/accounts/pkg/indexer/test/test.go b/accounts/pkg/indexer/test/test.go
deleted file mode 100644
index 5a131e71d..000000000
--- a/accounts/pkg/indexer/test/test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-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()}))
-}