5 files changed, 10 insertions, 7 deletions
diff --git a/pkg/test/dockerutil/BUILD b/pkg/test/dockerutil/BUILD
index a5e84658a..7f983a0b3 100644
--- a/pkg/test/dockerutil/BUILD
+++ b/pkg/test/dockerutil/BUILD
@@ -22,6 +22,7 @@ go_library(
         "@com_github_docker_docker//client:go_default_library",
         "@com_github_docker_docker//pkg/stdcopy:go_default_library",
         "@com_github_docker_go_connections//nat:go_default_library",
+        "@org_golang_x_sys//unix:go_default_library",
     ],
 )
 
diff --git a/pkg/test/dockerutil/profile.go b/pkg/test/dockerutil/profile.go
index 5cad3e959..4855a52fc 100644
--- a/pkg/test/dockerutil/profile.go
+++ b/pkg/test/dockerutil/profile.go
@@ -20,8 +20,9 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"syscall"
 	"time"
+
+	"golang.org/x/sys/unix"
 )
 
 // profile represents profile-like operations on a container.
@@ -114,7 +115,7 @@ func (p *profile) createProcess(c *Container) error {
 // killProcess kills the process, if running.
 func (p *profile) killProcess() error {
 	if p.cmd != nil && p.cmd.Process != nil {
-		return p.cmd.Process.Signal(syscall.SIGTERM)
+		return p.cmd.Process.Signal(unix.SIGTERM)
 	}
 	return nil
 }
diff --git a/pkg/test/testutil/BUILD b/pkg/test/testutil/BUILD
index 00600a2ad..a789c246e 100644
--- a/pkg/test/testutil/BUILD
+++ b/pkg/test/testutil/BUILD
@@ -18,5 +18,6 @@ go_library(
         "@com_github_cenkalti_backoff//:go_default_library",
         "@com_github_kr_pty//:go_default_library",
         "@com_github_opencontainers_runtime_spec//specs-go:go_default_library",
+        "@org_golang_x_sys//unix:go_default_library",
     ],
 )
diff --git a/pkg/test/testutil/sh.go b/pkg/test/testutil/sh.go
index 1c77562be..cd5b0557a 100644
--- a/pkg/test/testutil/sh.go
+++ b/pkg/test/testutil/sh.go
@@ -22,10 +22,10 @@ import (
 	"os"
 	"os/exec"
 	"strings"
-	"syscall"
 	"time"
 
 	"github.com/kr/pty"
+	"golang.org/x/sys/unix"
 )
 
 // Prompt is used as shell prompt.
@@ -477,7 +477,7 @@ func NewShell(ctx context.Context, logger Logger) (*Shell, func(), error) {
 	cmd.Stdin = ptyReplica
 	cmd.Stdout = ptyReplica
 	cmd.Stderr = ptyReplica
-	cmd.SysProcAttr = &syscall.SysProcAttr{
+	cmd.SysProcAttr = &unix.SysProcAttr{
 		Setsid:  true,
 		Setctty: true,
 		Ctty:    0,
diff --git a/pkg/test/testutil/testutil.go b/pkg/test/testutil/testutil.go
index a35c7ffa6..663c83679 100644
--- a/pkg/test/testutil/testutil.go
+++ b/pkg/test/testutil/testutil.go
@@ -36,12 +36,12 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
-	"syscall"
 	"testing"
 	"time"
 
 	"github.com/cenkalti/backoff"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
+	"golang.org/x/sys/unix"
 	"gvisor.dev/gvisor/pkg/sync"
 	"gvisor.dev/gvisor/runsc/config"
 	"gvisor.dev/gvisor/runsc/specutils"
@@ -408,7 +408,7 @@ func (r *Reaper) Start() {
 	}
 
 	r.ch = make(chan os.Signal, 1)
-	signal.Notify(r.ch, syscall.SIGCHLD)
+	signal.Notify(r.ch, unix.SIGCHLD)
 
 	go func() {
 		for {
@@ -425,7 +425,7 @@ func (r *Reaper) Start() {
 				return
 			}
 			for {
-				cpid, _ := syscall.Wait4(-1, nil, syscall.WNOHANG, nil)
+				cpid, _ := unix.Wait4(-1, nil, unix.WNOHANG, nil)
 				if cpid < 1 {
 					break
 				}