@@ -180,10 +180,9 @@ RUN echo "source $PWD/hack/make/.integration-test-helpers" >> /etc/bash.bashrc

 # Get useful and necessary Hub images so we can "docker load" locally instead of pulling

 COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/

-# TODO: when issue #35963 fixed, we can upgrade the busybox to multi-arch

 RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \

 	buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \

-	busybox:latest@sha256:32f093055929dbc23dec4d03e09dfe971f5973a9ca5cf059cbfb644c206aa83f \

+	busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \

 	debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \

 	hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c

 # See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list)

@@ -147,7 +147,7 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker

 COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/

 RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \

 	buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \

-	busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \

+	busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \

 	debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \

 	hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c

 # See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list)

@@ -133,7 +133,7 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker

 COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/

 RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \

 	buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \

-	busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \

+	busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \

 	debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \

 	hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c

 # See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list)

@@ -16,10 +16,10 @@ WORKDIR /go/src/github.com/docker/docker/

 # Generate frozen images

 COPY contrib/download-frozen-image-v2.sh contrib/download-frozen-image-v2.sh

 RUN contrib/download-frozen-image-v2.sh /output/docker-frozen-images \

-  buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \

-  busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \

-  debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \

-  hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c

+	buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \

+	busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \

+	debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \

+	hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c

 # Download Docker CLI binary

 COPY hack/dockerfile hack/dockerfile

@@ -131,7 +131,7 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker

 COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/

 RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \

 	buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \

-	busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \

+	busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \

 	debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \

 	hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c

 # See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list)

@@ -125,7 +125,7 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker

 COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/

 RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \

 	buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \

-	busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \

+	busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \

 	debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \

 	hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c

 # See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list)

@@ -400,13 +400,7 @@ func (s *DockerSuite) TestBuildLastModified(c *check.C) {

 	defer server.Close()

 	var out, out2 string

-	var args []string

-	// Temopray workaround for #35963. Will remove this when that issue fixed

-	if runtime.GOARCH == "amd64" {

-		args = []string{"run", name, "ls", "-le", "/file"}

-	} else {

-		args = []string{"run", name, "ls", "-l", "--full-time", "/file"}

-	}

+	args := []string{"run", name, "ls", "-l", "--full-time", "/file"}

 	dFmt := `FROM busybox

 ADD %s/file /`

@@ -2239,14 +2239,7 @@ func (s *DockerSuite) TestRunSlowStdoutConsumer(c *check.C) {

 	// alternate to /dev/zero and /dev/stdout.

 	testRequires(c, DaemonIsLinux)

-	// TODO will remove this if issue #35963 fixed

-	var args []string

-	if runtime.GOARCH == "amd64" {

-		args = []string{"run", "--rm", "busybox", "/bin/sh", "-c", "dd if=/dev/zero of=/dev/stdout bs=1024 count=2000 | catv"}

-	} else {

-		args = []string{"run", "--rm", "busybox", "/bin/sh", "-c", "dd if=/dev/zero of=/dev/stdout bs=1024 count=2000 | cat -v"}

-	}

-

+	args := []string{"run", "--rm", "busybox", "/bin/sh", "-c", "dd if=/dev/zero of=/dev/stdout bs=1024 count=2000 | cat -v"}

 	cont := exec.Command(dockerBinary, args...)

 	stdout, err := cont.StdoutPipe()

@@ -37,6 +37,9 @@ func FrozenImagesLinux(client client.APIClient, images ...string) error {

 			if img == "hello-world:frozen" {

 				srcName = "hello-world:latest"

 			}

+			if img == "busybox:1.27-glibc" {

+				img = "busybox:latest"

+			}

 			loadImages = append(loadImages, struct{ srcName, destName string }{

 				srcName:  srcName,

 				destName: img,

@@ -9,7 +9,7 @@ import (

 	"github.com/stretchr/testify/require"

 )

-var frozenImages = []string{"busybox:latest", "hello-world:frozen", "debian:jessie"}

+var frozenImages = []string{"busybox:1.27-glibc", "hello-world:frozen", "debian:jessie"}

 type protectedElements struct {

 	containers map[string]struct{}