3 files changed, 5 insertions, 25 deletions
diff --git a/test/root/BUILD b/test/root/BUILD
index a9130b34f..8d9fff578 100644
--- a/test/root/BUILD
+++ b/test/root/BUILD
@@ -1,5 +1,4 @@
 load("//tools:defs.bzl", "go_library", "go_test")
-load("//tools/vm:defs.bzl", "vm_test")
 
 package(licenses = ["notice"])
 
@@ -24,12 +23,8 @@ go_test(
     ],
     library = ":root",
     tags = [
-        # Requires docker and runsc to be configured before the test runs.
-        # Also, the test needs to be run as root. Note that below, the
-        # root_vm_test relies on the default runtime 'runsc' being installed by
-        # the default installer.
-        "manual",
         "local",
+        "manual",
     ],
     visibility = ["//:sandbox"],
     deps = [
@@ -46,10 +41,3 @@ go_test(
         "@org_golang_x_sys//unix:go_default_library",
     ],
 )
-
-vm_test(
-    name = "root_vm_test",
-    size = "large",
-    shard_count = 1,
-    targets = [":root_test"],
-)
diff --git a/test/root/crictl_test.go b/test/root/crictl_test.go
index 11ac5cb52..df52dd381 100644
--- a/test/root/crictl_test.go
+++ b/test/root/crictl_test.go
@@ -315,7 +315,7 @@ const (
 	// v1 is the containerd API v1.
 	v1 string = "v1"
 
-	// v1 is the containerd API v21.
+	// v2 is the containerd API v2.
 	v2 string = "v2"
 )
 
@@ -480,7 +480,7 @@ func setup(t *testing.T, version string) (*criutil.Crictl, func(), error) {
 	}
 
 	// Wait for containerd to boot.
-	if err := testutil.WaitUntilRead(startupR, "Start streaming server", nil, 10*time.Second); err != nil {
+	if err := testutil.WaitUntilRead(startupR, "Start streaming server", 10*time.Second); err != nil {
 		t.Fatalf("failed to start containerd: %v", err)
 	}
 
diff --git a/test/root/oom_score_adj_test.go b/test/root/oom_score_adj_test.go
index 4243eb59e..0dcc0fdea 100644
--- a/test/root/oom_score_adj_test.go
+++ b/test/root/oom_score_adj_test.go
@@ -40,11 +40,7 @@ var (
 // TestOOMScoreAdjSingle tests that oom_score_adj is set properly in a
 // single container sandbox.
 func TestOOMScoreAdjSingle(t *testing.T) {
-	ppid, err := specutils.GetParentPid(os.Getpid())
-	if err != nil {
-		t.Fatalf("getting parent pid: %v", err)
-	}
-	parentOOMScoreAdj, err := specutils.GetOOMScoreAdj(ppid)
+	parentOOMScoreAdj, err := specutils.GetOOMScoreAdj(os.Getppid())
 	if err != nil {
 		t.Fatalf("getting parent oom_score_adj: %v", err)
 	}
@@ -122,11 +118,7 @@ func TestOOMScoreAdjSingle(t *testing.T) {
 // TestOOMScoreAdjMulti tests that oom_score_adj is set properly in a
 // multi-container sandbox.
 func TestOOMScoreAdjMulti(t *testing.T) {
-	ppid, err := specutils.GetParentPid(os.Getpid())
-	if err != nil {
-		t.Fatalf("getting parent pid: %v", err)
-	}
-	parentOOMScoreAdj, err := specutils.GetOOMScoreAdj(ppid)
+	parentOOMScoreAdj, err := specutils.GetOOMScoreAdj(os.Getppid())
 	if err != nil {
 		t.Fatalf("getting parent oom_score_adj: %v", err)
 	}