3 files changed, 11 insertions, 5 deletions
diff --git a/runsc/test/testutil/BUILD b/runsc/test/testutil/BUILD
index eedf962a4..327e7ca4d 100644
--- a/runsc/test/testutil/BUILD
+++ b/runsc/test/testutil/BUILD
@@ -10,7 +10,7 @@ go_library(
         "testutil.go",
         "testutil_race.go",
     ],
-    importpath = "gvisor.googlesource.com/gvisor/runsc/test/testutil",
+    importpath = "gvisor.dev/gvisor/runsc/test/testutil",
     visibility = ["//:sandbox"],
     deps = [
         "//runsc/boot",
diff --git a/runsc/test/testutil/docker.go b/runsc/test/testutil/docker.go
index 81f5a9ef0..3f3e191b0 100644
--- a/runsc/test/testutil/docker.go
+++ b/runsc/test/testutil/docker.go
@@ -15,6 +15,7 @@
 package testutil
 
 import (
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -30,10 +31,15 @@ import (
 	"github.com/kr/pty"
 )
 
+var runtimeType = flag.String("runtime-type", "", "specify which runtime to use: kvm, hostnet, overlay")
+
 func getRuntime() string {
 	r, ok := os.LookupEnv("RUNSC_RUNTIME")
 	if !ok {
-		return "runsc-test"
+		r = "runsc-test"
+	}
+	if *runtimeType != "" {
+		r += "-" + *runtimeType
 	}
 	return r
 }
@@ -197,7 +203,7 @@ func (d *Docker) Stop() error {
 }
 
 // Run calls 'docker run' with the arguments provided. The container starts
-// running in the backgroud and the call returns immediately.
+// running in the background and the call returns immediately.
 func (d *Docker) Run(args ...string) error {
 	a := []string{"run", "--runtime", d.Runtime, "--name", d.Name, "-d"}
 	a = append(a, args...)
diff --git a/runsc/test/testutil/testutil.go b/runsc/test/testutil/testutil.go
index 1bd5adc54..ecab6871d 100644
--- a/runsc/test/testutil/testutil.go
+++ b/runsc/test/testutil/testutil.go
@@ -38,8 +38,8 @@ import (
 
 	"github.com/cenkalti/backoff"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"gvisor.googlesource.com/gvisor/runsc/boot"
-	"gvisor.googlesource.com/gvisor/runsc/specutils"
+	"gvisor.dev/gvisor/runsc/boot"
+	"gvisor.dev/gvisor/runsc/specutils"
 )
 
 func init() {