4 files changed, 13 insertions, 7 deletions
diff --git a/runsc/test/image/image_test.go b/runsc/test/image/image_test.go
index 14cbd30c4..ddaa2c13b 100644
--- a/runsc/test/image/image_test.go
+++ b/runsc/test/image/image_test.go
@@ -209,11 +209,14 @@ func TestMysql(t *testing.T) {
 }
 
 func TestPythonHello(t *testing.T) {
-	if err := testutil.Pull("google/python-hello"); err != nil {
+	// TODO(b/136503277): Once we have more complete python runtime tests,
+	// we can drop this one.
+	const img = "gcr.io/gvisor-presubmit/python-hello"
+	if err := testutil.Pull(img); err != nil {
 		t.Fatalf("docker pull failed: %v", err)
 	}
 	d := testutil.MakeDocker("python-hello-test")
-	if err := d.Run("-p", "8080", "google/python-hello"); err != nil {
+	if err := d.Run("-p", "8080", img); err != nil {
 		t.Fatalf("docker run failed: %v", err)
 	}
 	defer d.CleanUp()
diff --git a/runsc/test/integration/integration_test.go b/runsc/test/integration/integration_test.go
index 55ebc2f5d..7cef4b9dd 100644
--- a/runsc/test/integration/integration_test.go
+++ b/runsc/test/integration/integration_test.go
@@ -86,16 +86,17 @@ func TestLifeCycle(t *testing.T) {
 }
 
 func TestPauseResume(t *testing.T) {
+	const img = "gcr.io/gvisor-presubmit/python-hello"
 	if !testutil.IsPauseResumeSupported() {
 		t.Log("Pause/resume is not supported, skipping test.")
 		return
 	}
 
-	if err := testutil.Pull("google/python-hello"); err != nil {
+	if err := testutil.Pull(img); err != nil {
 		t.Fatal("docker pull failed:", err)
 	}
 	d := testutil.MakeDocker("pause-resume-test")
-	if err := d.Run("-p", "8080", "google/python-hello"); err != nil {
+	if err := d.Run("-p", "8080", img); err != nil {
 		t.Fatalf("docker run failed: %v", err)
 	}
 	defer d.CleanUp()
@@ -149,15 +150,16 @@ func TestPauseResume(t *testing.T) {
 }
 
 func TestCheckpointRestore(t *testing.T) {
+	const img = "gcr.io/gvisor-presubmit/python-hello"
 	if !testutil.IsPauseResumeSupported() {
 		t.Log("Pause/resume is not supported, skipping test.")
 		return
 	}
-	if err := testutil.Pull("google/python-hello"); err != nil {
+	if err := testutil.Pull(img); err != nil {
 		t.Fatal("docker pull failed:", err)
 	}
 	d := testutil.MakeDocker("save-restore-test")
-	if err := d.Run("-p", "8080", "google/python-hello"); err != nil {
+	if err := d.Run("-p", "8080", img); err != nil {
 		t.Fatalf("docker run failed: %v", err)
 	}
 	defer d.CleanUp()
diff --git a/runsc/test/integration/regression_test.go b/runsc/test/integration/regression_test.go
index 39b30e757..fb68dda99 100644
--- a/runsc/test/integration/regression_test.go
+++ b/runsc/test/integration/regression_test.go
@@ -32,7 +32,7 @@ func TestBindOverlay(t *testing.T) {
 	}
 	d := testutil.MakeDocker("bind-overlay-test")
 
-	cmd := "nc -l -U /var/run/sock& sleep 1 && echo foobar-asdf | nc -U /var/run/sock"
+	cmd := "nc -l -U /var/run/sock & p=$! && sleep 1 && echo foobar-asdf | nc -U /var/run/sock && wait $p"
 	got, err := d.RunFg("ubuntu:trusty", "bash", "-c", cmd)
 	if err != nil {
 		t.Fatal("docker run failed:", err)
diff --git a/runsc/test/testutil/testutil.go b/runsc/test/testutil/testutil.go
index ecab6871d..a98675bfc 100644
--- a/runsc/test/testutil/testutil.go
+++ b/runsc/test/testutil/testutil.go
@@ -132,6 +132,7 @@ func TestConfig() *boot.Config {
 		LogPackets: true,
 		Network:    boot.NetworkNone,
 		Strace:     true,
+		Platform:   "ptrace",
 		FileAccess: boot.FileAccessExclusive,
 		TestOnlyAllowRunAsCurrentUserWithoutChroot: true,
 		NumNetworkChannels:                         1,