diff --git a/etcd_client_test.go b/etcd_client_test.go
index 8c2e07d..4a6fe8e 100644
--- a/etcd_client_test.go
+++ b/etcd_client_test.go
@@ -79,6 +79,7 @@ func NewEtcdForTestWithTls(t *testing.T, withTLS bool) (*embed.Etcd, string, str
 	os.Chmod(cfg.Dir, 0700) // nolint
 	cfg.LogLevel = "warn"
 	cfg.Name = "signalingtest"
+	cfg.ZapLoggerBuilder = embed.NewZapLoggerBuilder(zaptest.NewLogger(t, zaptest.Level(zap.WarnLevel)))
 
 	u, err := url.Parse(etcdListenUrl)
 	require.NoError(err)
@@ -119,7 +120,6 @@ func NewEtcdForTestWithTls(t *testing.T, withTLS bool) (*embed.Etcd, string, str
 		cfg.ListenPeerUrls = []url.URL{*peerListener}
 		cfg.AdvertisePeerUrls = []url.URL{*peerListener}
 		cfg.InitialCluster = "signalingtest=" + peerListener.String()
-		cfg.ZapLoggerBuilder = embed.NewZapLoggerBuilder(zaptest.NewLogger(t, zaptest.Level(zap.WarnLevel)))
 		etcd, err = embed.StartEtcd(cfg)
 		if isErrorAddressAlreadyInUse(err) {
 			continue
diff --git a/proxy/proxy_tokens_etcd_test.go b/proxy/proxy_tokens_etcd_test.go
index be600f2..4161d12 100644
--- a/proxy/proxy_tokens_etcd_test.go
+++ b/proxy/proxy_tokens_etcd_test.go
@@ -41,6 +41,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.etcd.io/etcd/server/v3/embed"
 	"go.etcd.io/etcd/server/v3/lease"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zaptest"
 
 	signaling "github.com/strukturag/nextcloud-spreed-signaling"
 )
@@ -73,6 +75,7 @@ func newEtcdForTesting(t *testing.T) *embed.Etcd {
 	cfg.Dir = t.TempDir()
 	os.Chmod(cfg.Dir, 0700) // nolint
 	cfg.LogLevel = "warn"
+	cfg.ZapLoggerBuilder = embed.NewZapLoggerBuilder(zaptest.NewLogger(t, zaptest.Level(zap.WarnLevel)))
 
 	u, err := url.Parse(etcdListenUrl)
 	require.NoError(t, err)