diff --git a/accounts/pkg/indexer/test/test.go b/accounts/pkg/indexer/test/test.go
index 5a131e71d2d..36b846fe881 100644
--- a/accounts/pkg/indexer/test/test.go
+++ b/accounts/pkg/indexer/test/test.go
@@ -3,6 +3,9 @@ package test
 import (
 	"context"
 	"flag"
+	"net"
+	"time"
+
 	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	mcfg "github.com/owncloud/ocis/storage/pkg/config"
@@ -20,4 +23,12 @@ func setupMetadataStorage() {
 	}
 
 	_ = app.Command("storage-metadata").Run(cli.NewContext(&app, &flag.FlagSet{}, &cli.Context{Context: context.Background()}))
+
+	// wait until port is open
+	d := net.Dialer{Timeout: 5 * time.Second}
+	conn, err := d.Dial("tcp", "localhost:9125")
+	if err != nil {
+		panic("timeout waiting for storage")
+	}
+	conn.Close()
 }