diff --git a/pkg/server/container_create_test.go b/pkg/server/container_create_test.go
index 630fe0a85..85a0cdd6a 100644
--- a/pkg/server/container_create_test.go
+++ b/pkg/server/container_create_test.go
@@ -467,7 +467,6 @@ func TestCreateContainer(t *testing.T) {
 		imageMetadataErr   bool
 		prepareSnapshotErr error
 		createRootDirErr   error
-		createMetadataErr  bool
 		expectErr          bool
 		expectMeta         *metadata.ContainerMetadata
 	}{
diff --git a/pkg/server/version_test.go b/pkg/server/version_test.go
index 8e979bae7..8f7273867 100644
--- a/pkg/server/version_test.go
+++ b/pkg/server/version_test.go
@@ -33,12 +33,10 @@ import (
 func TestVersion(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
-	// TODO(random-liu): Check containerd version after containerd fixes its version.
 	for desc, test := range map[string]struct {
-		versionRes      *versionapi.VersionResponse
-		versionErr      error
-		expectErr       bool
-		expectedVersion string
+		versionRes *versionapi.VersionResponse
+		versionErr error
+		expectErr  bool
 	}{
 		"should return error if containerd version returns error": {
 			versionErr: errors.New("random error"),