diff --git a/pkg/ring/basic_lifecycler_delegates_test.go b/pkg/ring/basic_lifecycler_delegates_test.go
index 4cb7f39fb96..22d0e863305 100644
--- a/pkg/ring/basic_lifecycler_delegates_test.go
+++ b/pkg/ring/basic_lifecycler_delegates_test.go
@@ -8,12 +8,12 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/grafana/dskit/services"
-	"github.com/grafana/dskit/test"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/cortexproject/cortex/pkg/util/concurrency"
+	"github.com/cortexproject/cortex/pkg/util/test"
 )
 
 func TestLeaveOnStoppingDelegate(t *testing.T) {
diff --git a/pkg/ring/basic_lifecycler_test.go b/pkg/ring/basic_lifecycler_test.go
index a8381f5e862..1076403b7ac 100644
--- a/pkg/ring/basic_lifecycler_test.go
+++ b/pkg/ring/basic_lifecycler_test.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/grafana/dskit/services"
-	"github.com/grafana/dskit/test"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/cortexproject/cortex/pkg/ring/kv"
 	"github.com/cortexproject/cortex/pkg/ring/kv/consul"
+	"github.com/cortexproject/cortex/pkg/util/test"
 )
 
 const (
diff --git a/pkg/ring/lifecycler_test.go b/pkg/ring/lifecycler_test.go
index 789c3760d38..5ad0d347759 100644
--- a/pkg/ring/lifecycler_test.go
+++ b/pkg/ring/lifecycler_test.go
@@ -10,12 +10,12 @@ import (
 	"github.com/go-kit/log"
 	"github.com/grafana/dskit/flagext"
 	"github.com/grafana/dskit/services"
-	"github.com/grafana/dskit/test"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/cortexproject/cortex/pkg/ring/kv/consul"
+	"github.com/cortexproject/cortex/pkg/util/test"
 )
 
 const (
diff --git a/pkg/ring/ring_test.go b/pkg/ring/ring_test.go
index 322f44ab7b1..cea95e3ab4d 100644
--- a/pkg/ring/ring_test.go
+++ b/pkg/ring/ring_test.go
@@ -15,7 +15,6 @@ import (
 	"github.com/go-kit/log"
 	"github.com/grafana/dskit/flagext"
 	"github.com/grafana/dskit/services"
-	"github.com/grafana/dskit/test"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/assert"
@@ -25,6 +24,7 @@ import (
 	"github.com/cortexproject/cortex/pkg/ring/kv/consul"
 	"github.com/cortexproject/cortex/pkg/ring/shard"
 	"github.com/cortexproject/cortex/pkg/ring/util"
+	"github.com/cortexproject/cortex/pkg/util/test"
 )
 
 const (
diff --git a/vendor/github.com/grafana/dskit/test/poll.go b/pkg/util/test/test/poll.go
similarity index 100%
rename from vendor/github.com/grafana/dskit/test/poll.go
rename to pkg/util/test/test/poll.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 74ee103834b..f2b2f62ce0c 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -366,7 +366,6 @@ github.com/grafana/dskit/internal/math
 github.com/grafana/dskit/multierror
 github.com/grafana/dskit/runutil
 github.com/grafana/dskit/services
-github.com/grafana/dskit/test
 # github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 ## explicit
 github.com/grpc-ecosystem/go-grpc-middleware