diff --git a/cio/io_test.go b/cio/io_test.go
index c8566eda6..6a654eef9 100644
--- a/cio/io_test.go
+++ b/cio/io_test.go
@@ -32,8 +32,8 @@ import (
 
 	"github.com/containerd/fifo"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func assertHasPrefix(t *testing.T, s, prefix string) {
diff --git a/cio/io_unix_test.go b/cio/io_unix_test.go
index 77a54d964..fc2cce96d 100644
--- a/cio/io_unix_test.go
+++ b/cio/io_unix_test.go
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func TestOpenFifos(t *testing.T) {
diff --git a/content/helpers_test.go b/content/helpers_test.go
index 5a0264062..a6b310b1e 100644
--- a/content/helpers_test.go
+++ b/content/helpers_test.go
@@ -25,9 +25,9 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/errdefs"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/opencontainers/go-digest"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 type copySource struct {
diff --git a/content/local/store_test.go b/content/local/store_test.go
index 7ee10d33d..07c560d5b 100644
--- a/content/local/store_test.go
+++ b/content/local/store_test.go
@@ -37,9 +37,9 @@ import (
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/content/testsuite"
 	"github.com/containerd/containerd/pkg/testutil"
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+	"gotest.tools/assert"
 )
 
 type memoryLabelStore struct {
diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go
index a15cb6890..974c7cb8e 100644
--- a/content/testsuite/testsuite.go
+++ b/content/testsuite/testsuite.go
@@ -31,10 +31,10 @@ import (
 
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/pkg/testutil"
-	"github.com/gotestyourself/gotestyourself/assert"
 	digest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
 )
 
 // ContentSuite runs a test suite on the content store given a factory function.
diff --git a/gc/scheduler/scheduler_test.go b/gc/scheduler/scheduler_test.go
index 2cc1ad216..891b814bd 100644
--- a/gc/scheduler/scheduler_test.go
+++ b/gc/scheduler/scheduler_test.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/gc"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func TestPauseThreshold(t *testing.T) {
diff --git a/images/oci/importer_test.go b/images/oci/importer_test.go
index 158be80cc..e8c950597 100644
--- a/images/oci/importer_test.go
+++ b/images/oci/importer_test.go
@@ -19,9 +19,9 @@ package oci
 import (
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+	"gotest.tools/assert"
 )
 
 func TestNormalizeImageRef(t *testing.T) {
diff --git a/log/context_test.go b/log/context_test.go
index a87452630..c5da476fa 100644
--- a/log/context_test.go
+++ b/log/context_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func TestLoggerContext(t *testing.T) {
diff --git a/mount/lookup_test/lookup_linux_test.go b/mount/lookup_test/lookup_linux_test.go
index 4a0b5e691..eb71b1045 100644
--- a/mount/lookup_test/lookup_linux_test.go
+++ b/mount/lookup_test/lookup_linux_test.go
@@ -36,7 +36,7 @@ import (
 
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/pkg/testutil"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func checkLookup(t *testing.T, fsType, mntPoint, dir string) {
diff --git a/pkg/testutil/helpers_unix.go b/pkg/testutil/helpers_unix.go
index 7f6abe496..681c0ade3 100644
--- a/pkg/testutil/helpers_unix.go
+++ b/pkg/testutil/helpers_unix.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/mount"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 // Unmount unmounts a given mountPoint and sets t.Error if it fails
diff --git a/remotes/docker/scope_test.go b/remotes/docker/scope_test.go
index 66898b35a..340e20506 100644
--- a/remotes/docker/scope_test.go
+++ b/remotes/docker/scope_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd/reference"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func TestRepositoryScope(t *testing.T) {
diff --git a/services/server/server_test.go b/services/server/server_test.go
index 3ba95e7b9..57b52197f 100644
--- a/services/server/server_test.go
+++ b/services/server/server_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestNewErrorsWithSamePathForRootAndState(t *testing.T) {
diff --git a/snapshots/storage/metastore_test.go b/snapshots/storage/metastore_test.go
index a1b287e7b..f5c70191e 100644
--- a/snapshots/storage/metastore_test.go
+++ b/snapshots/storage/metastore_test.go
@@ -27,9 +27,9 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/google/go-cmp/cmp"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 type testFunc func(context.Context, *testing.T, *MetaStore)
diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go
index 2c6f20861..6a1be0a69 100644
--- a/snapshots/testsuite/testsuite.go
+++ b/snapshots/testsuite/testsuite.go
@@ -32,8 +32,8 @@ import (
 	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/continuity/fs/fstest"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 // SnapshotterSuite runs a test suite on the snapshotter given a factory function.
diff --git a/sys/oom_unix_test.go b/sys/oom_unix_test.go
index 214ed890f..7ccf57f12 100644
--- a/sys/oom_unix_test.go
+++ b/sys/oom_unix_test.go
@@ -29,8 +29,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestSetPositiveOomScoreAdjustment(t *testing.T) {