@@ -107,7 +107,7 @@ func Docker(cmd icmd.Cmd, cmdOperators ...CmdOperator) *icmd.Result {

 // validateArgs is a checker to ensure tests are not running commands which are

 // not supported on platforms. Specifically on Windows this is 'busybox top'.

 func validateArgs(args ...string) error {

-	if testEnv.OSType != "windows" {

+	if testEnv.DaemonInfo.OSType != "windows" {

 		return nil

 	}

 	foundBusybox := -1

@@ -987,7 +987,7 @@ func (s *DockerAPISuite) TestContainerAPIWait(c *testing.T) {

 	name := "test-api-wait"

 	sleepCmd := "/bin/sleep"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		sleepCmd = "sleep"

 	}

 	dockerCmd(c, "run", "--name", name, "busybox", sleepCmd, "2")

@@ -1194,7 +1194,7 @@ func (s *DockerAPISuite) TestContainerAPIDeleteRemoveVolume(c *testing.T) {

 	testRequires(c, testEnv.IsLocalDaemon)

 	vol := "/testvolume"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		vol = `c:\testvolume`

 	}

@@ -1972,7 +1972,7 @@ func (s *DockerAPISuite) TestContainersAPICreateMountsCreate(c *testing.T) {

 	var (

 		testImg string

 	)

-	if testEnv.OSType != "windows" {

+	if testEnv.DaemonInfo.OSType != "windows" {

 		testImg = "test-mount-config"

 		buildImageSuccessfully(c, testImg, build.WithDockerfile(`

 	FROM busybox

@@ -2073,7 +2073,7 @@ func (s *DockerAPISuite) TestContainersAPICreateMountsCreate(c *testing.T) {

 		}

 	}

-	if testEnv.OSType != "windows" { // Windows does not support volume populate

+	if testEnv.DaemonInfo.OSType != "windows" { // Windows does not support volume populate

 		cases = append(cases, []testCase{

 			{

 				spec:     mount.Mount{Type: "volume", Target: destPath, VolumeOptions: &mount.VolumeOptions{NoCopy: true}},

@@ -78,7 +78,7 @@ func (s *DockerAPISuite) TestAPIImagesDelete(c *testing.T) {

 	assert.NilError(c, err)

 	defer apiClient.Close()

-	if testEnv.OSType != "windows" {

+	if testEnv.DaemonInfo.OSType != "windows" {

 		testRequires(c, Network)

 	}

 	name := "test-api-images-delete"

@@ -102,7 +102,7 @@ func (s *DockerAPISuite) TestAPIImagesHistory(c *testing.T) {

 	assert.NilError(c, err)

 	defer apiClient.Close()

-	if testEnv.OSType != "windows" {

+	if testEnv.DaemonInfo.OSType != "windows" {

 		testRequires(c, Network)

 	}

 	name := "test-api-images-history"

@@ -27,7 +27,7 @@ func (s *DockerAPISuite) TestInspectAPIContainerResponse(c *testing.T) {

 	var cases []acase

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		cases = []acase{

 			{"v1.25", append(keysBase, "Mounts")},

 		}

@@ -42,7 +42,7 @@ func (s *DockerAPISuite) TestAPIStatsNoStreamGetCpu(c *testing.T) {

 	var cpuPercent = 0.0

-	if testEnv.OSType != "windows" {

+	if testEnv.DaemonInfo.OSType != "windows" {

 		cpuDelta := float64(v.CPUStats.CPUUsage.TotalUsage - v.PreCPUStats.CPUUsage.TotalUsage)

 		systemDelta := float64(v.CPUStats.SystemUsage - v.PreCPUStats.SystemUsage)

 		cpuPercent = (cpuDelta / systemDelta) * float64(len(v.CPUStats.CPUUsage.PercpuUsage)) * 100.0

@@ -109,7 +109,7 @@ func (s *DockerAPISuite) TestAPIStatsNetworkStats(c *testing.T) {

 	// Retrieve the container address

 	net := "bridge"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		net = "nat"

 	}

 	contIP := findContainerIP(c, id, net)

@@ -157,7 +157,7 @@ func (s *DockerAPISuite) TestAPIStatsNetworkStats(c *testing.T) {

 	// On Linux, account for ARP.

 	expRxPkts := preRxPackets + uint64(numPings)

 	expTxPkts := preTxPackets + uint64(numPings)

-	if testEnv.OSType != "windows" {

+	if testEnv.DaemonInfo.OSType != "windows" {

 		expRxPkts++

 		expTxPkts++

 	}

@@ -40,13 +40,13 @@ func (s *DockerAPISuite) TestAPIGetEnabledCORS(c *testing.T) {

 	body.Close()

 	// TODO: @runcom incomplete tests, why old integration tests had this headers

 	// and here none of the headers below are in the response?

-	//c.Log(res.Header)

-	//assert.Equal(c, res.Header.Get("Access-Control-Allow-Origin"), "*")

-	//assert.Equal(c, res.Header.Get("Access-Control-Allow-Headers"), "Origin, X-Requested-With, Content-Type, Accept, X-Registry-Auth")

+	// c.Log(res.Header)

+	// assert.Equal(c, res.Header.Get("Access-Control-Allow-Origin"), "*")

+	// assert.Equal(c, res.Header.Get("Access-Control-Allow-Headers"), "Origin, X-Requested-With, Content-Type, Accept, X-Registry-Auth")

 }

 func (s *DockerAPISuite) TestAPIClientVersionOldNotSupported(c *testing.T) {

-	if testEnv.OSType != runtime.GOOS {

+	if testEnv.DaemonInfo.OSType != runtime.GOOS {

 		c.Skip("Daemon platform doesn't match test platform")

 	}

 	if api.MinVersion == api.DefaultVersion {

@@ -52,7 +52,7 @@ func (s *DockerCLIBuildSuite) TestBuildJSONEmptyRun(c *testing.T) {

 func (s *DockerCLIBuildSuite) TestBuildShCmdJSONEntrypoint(c *testing.T) {

 	name := "testbuildshcmdjsonentrypoint"

 	expected := "/bin/sh -c echo test"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected = "cmd /S /C echo test"

 	}

@@ -90,7 +90,7 @@ func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementVolume(c *testing.T

 	var volumePath string

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		volumePath = "c:/quux"

 	} else {

 		volumePath = "/quux"

@@ -145,7 +145,7 @@ func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementWorkdir(c *testing.

 	res := inspectFieldJSON(c, name, "Config.WorkingDir")

 	expected := `"/work"`

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected = `"C:\\work"`

 	}

 	if res != expected {

@@ -1298,7 +1298,7 @@ func (s *DockerCLIBuildSuite) TestBuildRelativeWorkdir(c *testing.T) {

 		expectedFinal string

 	)

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected1 = `C:/`

 		expected2 = `C:/test1`

 		expected3 = `C:/test2`

@@ -1377,7 +1377,7 @@ func (s *DockerCLIBuildSuite) TestBuildWorkdirWithEnvVariables(c *testing.T) {

 	name := "testbuildworkdirwithenvvariables"

 	var expected string

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected = `C:\test1\test2`

 	} else {

 		expected = `/test1/test2`

@@ -1399,7 +1399,7 @@ func (s *DockerCLIBuildSuite) TestBuildRelativeCopy(c *testing.T) {

 	testRequires(c, NotUserNamespace)

 	var expected string

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected = `C:/test1/test2`

 	} else {

 		expected = `/test1/test2`

@@ -2230,7 +2230,7 @@ func (s *DockerCLIBuildSuite) TestBuildOnBuild(c *testing.T) {

 // gh #2446

 func (s *DockerCLIBuildSuite) TestBuildAddToSymlinkDest(c *testing.T) {

 	makeLink := `ln -s /foo /bar`

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		makeLink = `mklink /D C:\bar C:\foo`

 	}

 	name := "testbuildaddtosymlinkdest"

@@ -3186,7 +3186,7 @@ func (s *DockerCLIBuildSuite) TestBuildCmdShDashC(c *testing.T) {

 	res := inspectFieldJSON(c, name, "Config.Cmd")

 	expected := `["/bin/sh","-c","echo cmd"]`

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected = `["cmd /S /C echo cmd"]`

 	}

 	if res != expected {

@@ -3258,7 +3258,7 @@ func (s *DockerCLIBuildSuite) TestBuildEntrypointCanBeOverriddenByChildInspect(c

 		expected = `["/bin/sh","-c","echo quux"]`

 	)

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected = `["cmd /S /C echo quux"]`

 	}

@@ -3328,7 +3328,7 @@ func (s *DockerCLIBuildSuite) TestBuildVerboseOut(c *testing.T) {

 	name := "testbuildverboseout"

 	expected := "\n123\n"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected = "\n123\r\n"

 	}

@@ -3344,7 +3344,7 @@ func (s *DockerCLIBuildSuite) TestBuildWithTabs(c *testing.T) {

 	res := inspectFieldJSON(c, name, "ContainerConfig.Cmd")

 	expected1 := `["/bin/sh","-c","echo\tone\t\ttwo"]`

 	expected2 := `["/bin/sh","-c","echo\u0009one\u0009\u0009two"]` // syntactically equivalent, and what Go 1.3 generates

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected1 = `["cmd /S /C echo\tone\t\ttwo"]`

 		expected2 = `["cmd /S /C echo\u0009one\u0009\u0009two"]` // syntactically equivalent, and what Go 1.3 generates

 	}

@@ -3542,7 +3542,7 @@ func (s *DockerCLIBuildSuite) TestBuildStderr(c *testing.T) {

 	result.Assert(c, icmd.Success)

 	// Windows to non-Windows should have a security warning

-	if runtime.GOOS == "windows" && testEnv.OSType != "windows" && !strings.Contains(result.Stdout(), "SECURITY WARNING:") {

+	if runtime.GOOS == "windows" && testEnv.DaemonInfo.OSType != "windows" && !strings.Contains(result.Stdout(), "SECURITY WARNING:") {

 		c.Fatalf("Stdout contains unexpected output: %q", result.Stdout())

 	}

@@ -3659,7 +3659,7 @@ func (s *DockerCLIBuildSuite) TestBuildVolumesRetainContents(c *testing.T) {

 		volName  = "/foo"

 	)

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		volName = "C:/foo"

 	}

@@ -3842,7 +3842,7 @@ RUN echo "  \

 	expected := "\n    foo  \n"

 	// Windows uses the builtin echo, which preserves quotes

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected = "\"    foo  \""

 	}

@@ -3876,7 +3876,7 @@ func (s *DockerCLIBuildSuite) TestBuildMissingArgs(c *testing.T) {

 		"INSERT":     {},

 	}

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		skipCmds = map[string]struct{}{

 			"CMD":        {},

 			"RUN":        {},

@@ -4008,7 +4008,7 @@ func (s *DockerCLIBuildSuite) TestBuildRUNErrMsg(c *testing.T) {

 	name := "testbuildbadrunerrmsg"

 	shell := "/bin/sh -c"

 	exitCode := 127

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		shell = "cmd /S /C"

 		// architectural - Windows has to start the container to determine the exe is bad, Linux does not

 		exitCode = 1

@@ -4027,7 +4027,7 @@ func (s *DockerCLIBuildSuite) TestBuildRUNErrMsg(c *testing.T) {

 func (s *DockerCLIBuildSuite) TestBuildNullStringInAddCopyVolume(c *testing.T) {

 	name := "testbuildnullstringinaddcopyvolume"

 	volName := "nullvolume"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		volName = `C:\\nullvolume`

 	}

@@ -4067,7 +4067,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArg(c *testing.T) {

 	envKey := "foo"

 	envVal := "bar"

 	var dockerfile string

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		// Bugs in Windows busybox port - use the default base image and native cmd stuff

 		dockerfile = fmt.Sprintf(`FROM `+minimalBaseImage()+`

 			ARG %s

@@ -4678,7 +4678,7 @@ func (s *DockerCLIBuildSuite) TestBuildMultiStageUnusedArg(c *testing.T) {

 func (s *DockerCLIBuildSuite) TestBuildNoNamedVolume(c *testing.T) {

 	volName := "testname:/foo"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		volName = "testname:C:\\foo"

 	}

 	dockerCmd(c, "run", "-v", volName, "busybox", "sh", "-c", "touch /foo/oops")

@@ -6105,7 +6105,7 @@ CMD echo foo

 	out, _ := dockerCmd(c, "inspect", "--format", "{{ json .Config.Cmd }}", "build2")

 	expected := `["/bin/sh","-c","echo foo"]`

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected = `["/bin/sh -c echo foo"]`

 	}

 	assert.Equal(c, strings.TrimSpace(out), expected)

@@ -137,7 +137,7 @@ func (s *DockerCLICommitSuite) TestCommitChange(c *testing.T) {

 	expectedEnv := "[DEBUG=true test=1 PATH=/foo]"

 	// bug fixed in 1.36, add min APi >= 1.36 requirement

 	// PR record https://github.com/moby/moby/pull/35582

-	if versions.GreaterThan(testEnv.DaemonAPIVersion(), "1.35") && testEnv.OSType != "windows" {

+	if versions.GreaterThan(testEnv.DaemonAPIVersion(), "1.35") && testEnv.DaemonInfo.OSType != "windows" {

 		// The ordering here is due to `PATH` being overridden from the container's

 		// ENV.  On windows, the container doesn't have a `PATH` ENV variable so

 		// the ordering is the same as the cli.

@@ -201,7 +201,7 @@ func (s *DockerCLICreateSuite) TestCreateLabelFromImage(c *testing.T) {

 func (s *DockerCLICreateSuite) TestCreateHostnameWithNumber(c *testing.T) {

 	image := "busybox"

 	// Busybox on Windows does not implement hostname command

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		image = testEnv.PlatformDefaults.BaseImage

 	}

 	out, _ := dockerCmd(c, "run", "-h", "web.0", image, "hostname")

@@ -284,7 +284,7 @@ func (s *DockerCLICreateSuite) TestCreateWithWorkdir(c *testing.T) {

 	dockerCmd(c, "create", "--name", name, "-w", dir, "busybox")

 	// Windows does not create the workdir until the container is started

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		dockerCmd(c, "start", name)

 		if testEnv.DaemonInfo.Isolation.IsHyperV() {

 			// Hyper-V isolated containers do not allow file-operations on a

@@ -657,7 +657,7 @@ func (s *DockerCLIEventSuite) TestEventsContainerRestart(c *testing.T) {

 	// wait until test2 is auto removed.

 	waitTime := 10 * time.Second

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		// Windows takes longer...

 		waitTime = 90 * time.Second

 	}

@@ -46,7 +46,7 @@ func (s *DockerCLIInfoSuite) TestInfoEnsureSucceeds(c *testing.T) {

 		"Live Restore Enabled:",

 	}

-	if testEnv.OSType == "linux" {

+	if testEnv.DaemonInfo.OSType == "linux" {

 		stringsToCheck = append(stringsToCheck, "Init Binary:", "Security Options:", "containerd version:", "runc version:", "init version:")

 	}

@@ -72,7 +72,7 @@ func (s *DockerCLIInspectSuite) TestInspectStatus(c *testing.T) {

 	// Windows does not support pause/unpause on Windows Server Containers.

 	// (RS1 does for Hyper-V Containers, but production CI is not setup for that)

-	if testEnv.OSType != "windows" {

+	if testEnv.DaemonInfo.OSType != "windows" {

 		dockerCmd(c, "pause", out)

 		inspectOut = inspectField(c, out, "State.Status")

 		assert.Equal(c, inspectOut, "paused")

@@ -174,7 +174,7 @@ func (s *DockerCLIInspectSuite) TestInspectContainerFilterInt(c *testing.T) {

 func (s *DockerCLIInspectSuite) TestInspectBindMountPoint(c *testing.T) {

 	modifier := ",z"

 	prefix, slash := getPrefixAndSlashFromDaemonPlatform()

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		modifier = ""

 		// Linux creates the host directory if it doesn't exist. Windows does not.

 		os.Mkdir(`c:\data`, os.ModeDir)

@@ -197,7 +197,7 @@ func (s *DockerCLIInspectSuite) TestInspectBindMountPoint(c *testing.T) {

 	assert.Equal(c, m.Driver, "")

 	assert.Equal(c, m.Source, prefix+slash+"data")

 	assert.Equal(c, m.Destination, prefix+slash+"data")

-	if testEnv.OSType != "windows" { // Windows does not set mode

+	if testEnv.DaemonInfo.OSType != "windows" { // Windows does not set mode

 		assert.Equal(c, m.Mode, "ro"+modifier)

 	}

 	assert.Equal(c, m.RW, false)

@@ -223,7 +223,7 @@ func (s *DockerCLIPsSuite) TestPsListContainersFilterStatus(c *testing.T) {

 		Err:      err,

 	})

 	// Windows doesn't support pausing of containers

-	if testEnv.OSType != "windows" {

+	if testEnv.DaemonInfo.OSType != "windows" {

 		// pause running container

 		out = cli.DockerCmd(c, "run", "-itd", "busybox").Combined()

 		pausedID := strings.TrimSpace(out)

@@ -299,7 +299,7 @@ func (s *DockerCLIRestartSuite) TestRestartContainerwithRestartPolicy(c *testing

 	id1 := strings.TrimSpace(out1)

 	id2 := strings.TrimSpace(out2)

 	waitTimeout := 15 * time.Second

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		waitTimeout = 150 * time.Second

 	}

 	err := waitInspect(id1, "{{ .State.Restarting }} {{ .State.Running }}", "false false", waitTimeout)

@@ -77,7 +77,7 @@ func (s *DockerCLIRmiSuite) TestRmiImgIDMultipleTag(c *testing.T) {

 	// Wait for it to exit as cannot commit a running container on Windows, and

 	// it will take a few seconds to exit

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		cli.WaitExited(c, containerID, 60*time.Second)

 	}

@@ -118,7 +118,7 @@ func (s *DockerCLIRmiSuite) TestRmiImgIDForce(c *testing.T) {

 	// Wait for it to exit as cannot commit a running container on Windows, and

 	// it will take a few seconds to exit

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		cli.WaitExited(c, containerID, 60*time.Second)

 	}

@@ -82,7 +82,7 @@ func (s *DockerCLIRunSuite) TestRunLeakyFileDescriptors(c *testing.T) {

 // this will fail when Internet access is unavailable

 func (s *DockerCLIRunSuite) TestRunLookupGoogleDNS(c *testing.T) {

 	testRequires(c, Network, NotArm)

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		// nslookup isn't present in Windows busybox. Is built-in. Further,

 		// nslookup isn't present in nanoserver. Hence just use PowerShell...

 		dockerCmd(c, "run", testEnv.PlatformDefaults.BaseImage, "powershell", "Resolve-DNSName", "google.com")

@@ -146,7 +146,7 @@ func (s *DockerCLIRunSuite) TestRunDetachedContainerIDPrinting(c *testing.T) {

 func (s *DockerCLIRunSuite) TestRunWorkingDirectory(c *testing.T) {

 	dir := "/root"

 	image := "busybox"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		dir = `C:/Windows`

 	}

@@ -169,7 +169,7 @@ func (s *DockerCLIRunSuite) TestRunWorkingDirectory(c *testing.T) {

 func (s *DockerCLIRunSuite) TestRunWithoutNetworking(c *testing.T) {

 	count := "-c"

 	image := "busybox"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		count = "-n"

 		image = testEnv.PlatformDefaults.BaseImage

 	}

@@ -360,7 +360,7 @@ func (s *DockerCLIRunSuite) TestRunWithVolumesFromExited(c *testing.T) {

 	)

 	// Create a file in a volume

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		out, exitCode = dockerCmd(c, "run", "--name", "test-data", "--volume", `c:\some\dir`, testEnv.PlatformDefaults.BaseImage, "cmd", "/c", `echo hello > c:\some\dir\file`)

 	} else {

 		out, exitCode = dockerCmd(c, "run", "--name", "test-data", "--volume", "/some/dir", "busybox", "touch", "/some/dir/file")

@@ -370,7 +370,7 @@ func (s *DockerCLIRunSuite) TestRunWithVolumesFromExited(c *testing.T) {

 	}

 	// Read the file from another container using --volumes-from to access the volume in the second container

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		out, exitCode = dockerCmd(c, "run", "--volumes-from", "test-data", testEnv.PlatformDefaults.BaseImage, "cmd", "/c", `type c:\some\dir\file`)

 	} else {

 		out, exitCode = dockerCmd(c, "run", "--volumes-from", "test-data", "busybox", "cat", "/some/dir/file")

@@ -402,7 +402,7 @@ func (s *DockerCLIRunSuite) TestRunCreateVolumesInSymlinkDir(c *testing.T) {

 	// In the case of Windows to Windows CI, if the machine is setup so that

 	// the temp directory is not the C: drive, this test is invalid and will

 	// not work.

-	if testEnv.OSType == "windows" && strings.ToLower(dir[:1]) != "c" {

+	if testEnv.DaemonInfo.OSType == "windows" && strings.ToLower(dir[:1]) != "c" {

 		c.Skip("Requires TEMP to point to C: drive")

 	}

@@ -412,7 +412,7 @@ func (s *DockerCLIRunSuite) TestRunCreateVolumesInSymlinkDir(c *testing.T) {

 	}

 	f.Close()

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		dockerFile = fmt.Sprintf("FROM %s\nRUN mkdir %s\nRUN mklink /D c:\\test %s", testEnv.PlatformDefaults.BaseImage, dir, dir)

 		containerPath = `c:\test\test`

 		cmd = "tasklist"

@@ -437,7 +437,7 @@ func (s *DockerCLIRunSuite) TestRunCreateVolumesInSymlinkDir2(c *testing.T) {

 	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	name := "test-volume-symlink2"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		dockerFile = fmt.Sprintf("FROM %s\nRUN mkdir c:\\%s\nRUN mklink /D c:\\test c:\\%s", testEnv.PlatformDefaults.BaseImage, name, name)

 		containerPath = `c:\test\test`

 		cmd = "tasklist"

@@ -461,7 +461,7 @@ func (s *DockerCLIRunSuite) TestRunVolumesFromInReadonlyModeFails(c *testing.T)

 		volumeDir string

 		fileInVol string

 	)

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		volumeDir = `c:/test` // Forward-slash as using busybox

 		fileInVol = `c:/test/file`

 	} else {

@@ -482,7 +482,7 @@ func (s *DockerCLIRunSuite) TestRunVolumesFromInReadWriteMode(c *testing.T) {

 		volumeDir string

 		fileInVol string

 	)

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		volumeDir = `c:/test` // Forward-slash as using busybox

 		fileInVol = `c:/test/file`

 	} else {

@@ -503,7 +503,7 @@ func (s *DockerCLIRunSuite) TestRunVolumesFromInReadWriteMode(c *testing.T) {

 func (s *DockerCLIRunSuite) TestVolumesFromGetsProperMode(c *testing.T) {

 	testRequires(c, testEnv.IsLocalDaemon)

 	prefix, slash := getPrefixAndSlashFromDaemonPlatform()

-	hostpath := RandomTmpDirPath("test", testEnv.OSType)

+	hostpath := RandomTmpDirPath("test", testEnv.DaemonInfo.OSType)

 	if err := os.MkdirAll(hostpath, 0755); err != nil {

 		c.Fatalf("Failed to create %s: %q", hostpath, err)

 	}

@@ -526,11 +526,11 @@ func (s *DockerCLIRunSuite) TestVolumesFromGetsProperMode(c *testing.T) {

 // Test for GH#10618

 func (s *DockerCLIRunSuite) TestRunNoDupVolumes(c *testing.T) {

-	path1 := RandomTmpDirPath("test1", testEnv.OSType)

-	path2 := RandomTmpDirPath("test2", testEnv.OSType)

+	path1 := RandomTmpDirPath("test1", testEnv.DaemonInfo.OSType)

+	path2 := RandomTmpDirPath("test2", testEnv.DaemonInfo.OSType)

 	someplace := ":/someplace"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		// Windows requires that the source directory exists before calling HCS

 		testRequires(c, testEnv.IsLocalDaemon)

 		someplace = `:c:\someplace`

@@ -579,7 +579,7 @@ func (s *DockerCLIRunSuite) TestRunNoDupVolumes(c *testing.T) {

 // Test for #1351

 func (s *DockerCLIRunSuite) TestRunApplyVolumesFromBeforeVolumes(c *testing.T) {

 	prefix := ""

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		prefix = `c:`

 	}

 	dockerCmd(c, "run", "--name", "parent", "-v", prefix+"/test", "busybox", "touch", prefix+"/test/foo")

@@ -588,7 +588,7 @@ func (s *DockerCLIRunSuite) TestRunApplyVolumesFromBeforeVolumes(c *testing.T) {

 func (s *DockerCLIRunSuite) TestRunMultipleVolumesFrom(c *testing.T) {

 	prefix := ""

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		prefix = `c:`

 	}

 	dockerCmd(c, "run", "--name", "parent1", "-v", prefix+"/test", "busybox", "touch", prefix+"/test/foo")

@@ -618,7 +618,7 @@ func (s *DockerCLIRunSuite) TestRunVerifyContainerID(c *testing.T) {

 // Test that creating a container with a volume doesn't crash. Regression test for #995.

 func (s *DockerCLIRunSuite) TestRunCreateVolume(c *testing.T) {

 	prefix := ""

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		prefix = `c:`

 	}

 	dockerCmd(c, "run", "-v", prefix+"/var/lib/data", "busybox", "true")

@@ -675,7 +675,7 @@ func (s *DockerCLIRunSuite) TestRunVolumesFromSymlinkPath(c *testing.T) {

 		RUN ln -s home /foo

 		VOLUME ["/foo/bar"]`

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		prefix = `c:`

 		dfContents = `FROM ` + testEnv.PlatformDefaults.BaseImage + `

 	    RUN mkdir c:\home

@@ -721,7 +721,7 @@ func (s *DockerCLIRunSuite) TestRunExitCode(c *testing.T) {

 func (s *DockerCLIRunSuite) TestRunUserDefaults(c *testing.T) {

 	expected := "uid=0(root) gid=0(root)"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected = "uid=0(root) gid=0(root) groups=0(root)"

 	}

 	out, _ := dockerCmd(c, "run", "busybox", "id")

@@ -927,7 +927,7 @@ func (s *DockerCLIRunSuite) TestRunEnvironmentOverride(c *testing.T) {

 }

 func (s *DockerCLIRunSuite) TestRunContainerNetwork(c *testing.T) {

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		// Windows busybox does not have ping. Use built in ping instead.

 		dockerCmd(c, "run", testEnv.PlatformDefaults.BaseImage, "ping", "-n", "1", "127.0.0.1")

 	} else {

@@ -1227,7 +1227,7 @@ func (s *DockerCLIRunSuite) TestRunModeHostname(c *testing.T) {

 func (s *DockerCLIRunSuite) TestRunRootWorkdir(c *testing.T) {

 	out, _ := dockerCmd(c, "run", "--workdir", "/", "busybox", "pwd")

 	expected := "/\n"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected = "C:" + expected

 	}

 	if out != expected {

@@ -1236,7 +1236,7 @@ func (s *DockerCLIRunSuite) TestRunRootWorkdir(c *testing.T) {

 }

 func (s *DockerCLIRunSuite) TestRunAllowBindMountingRoot(c *testing.T) {

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		// Windows busybox will fail with Permission Denied on items such as pagefile.sys

 		dockerCmd(c, "run", "-v", `c:\:c:\host`, testEnv.PlatformDefaults.BaseImage, "cmd", "-c", "dir", `c:\host`)

 	} else {

@@ -1247,7 +1247,7 @@ func (s *DockerCLIRunSuite) TestRunAllowBindMountingRoot(c *testing.T) {

 func (s *DockerCLIRunSuite) TestRunDisallowBindMountingRootToRoot(c *testing.T) {

 	mount := "/:/"

 	targetDir := "/host"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		mount = `c:\:c\`

 		targetDir = "c:/host" // Forward slash as using busybox

 	}

@@ -1708,7 +1708,7 @@ func (s *DockerCLIRunSuite) TestRunCleanupCmdOnEntrypoint(c *testing.T) {

 	}

 	out = strings.TrimSpace(out)

 	expected := "root"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		if strings.Contains(testEnv.PlatformDefaults.BaseImage, "servercore") {

 			expected = `user manager\containeradministrator`

 		} else {

@@ -1724,7 +1724,7 @@ func (s *DockerCLIRunSuite) TestRunCleanupCmdOnEntrypoint(c *testing.T) {

 func (s *DockerCLIRunSuite) TestRunWorkdirExistsAndIsFile(c *testing.T) {

 	existingFile := "/bin/cat"

 	expected := "not a directory"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		existingFile = `\windows\system32\ntdll.dll`

 		expected = `The directory name is invalid.`

 	}

@@ -1740,7 +1740,7 @@ func (s *DockerCLIRunSuite) TestRunExitOnStdinClose(c *testing.T) {

 	meow := "/bin/cat"

 	delay := 60

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		meow = "cat"

 	}

 	runCmd := exec.Command(dockerBinary, "run", "--name", name, "-i", "busybox", meow)

@@ -1883,7 +1883,7 @@ func (s *DockerCLIRunSuite) TestRunEntrypoint(c *testing.T) {

 func (s *DockerCLIRunSuite) TestRunBindMounts(c *testing.T) {

 	testRequires(c, testEnv.IsLocalDaemon)

-	if testEnv.OSType == "linux" {

+	if testEnv.DaemonInfo.OSType == "linux" {

 		testRequires(c, DaemonIsLinux, NotUserNamespace)

 	}

@@ -1904,7 +1904,7 @@ func (s *DockerCLIRunSuite) TestRunBindMounts(c *testing.T) {

 	}

 	// test writing to bind mount

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		dockerCmd(c, "run", "-v", fmt.Sprintf(`%s:c:\tmp:rw`, tmpDir), "busybox", "touch", "c:/tmp/holla")

 	} else {

 		dockerCmd(c, "run", "-v", fmt.Sprintf("%s:/tmp:rw", tmpDir), "busybox", "touch", "/tmp/holla")

@@ -1919,7 +1919,7 @@ func (s *DockerCLIRunSuite) TestRunBindMounts(c *testing.T) {

 	}

 	// Windows does not (and likely never will) support mounting a single file

-	if testEnv.OSType != "windows" {

+	if testEnv.DaemonInfo.OSType != "windows" {

 		// test mount a file

 		dockerCmd(c, "run", "-v", fmt.Sprintf("%s/holla:/tmp/holla:rw", tmpDir), "busybox", "sh", "-c", "echo -n 'yotta' > /tmp/holla")

 		content := readFile(path.Join(tmpDir, "holla"), c) // Will fail if the file doesn't exist

@@ -1988,7 +1988,7 @@ func (s *DockerCLIRunSuite) TestRunSetMacAddress(c *testing.T) {

 	skip.If(c, RuntimeIsWindowsContainerd(), "FIXME: Broken on Windows + containerd combination")

 	mac := "12:34:56:78:9a:bc"

 	var out string

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		out, _ = dockerCmd(c, "run", "-i", "--rm", fmt.Sprintf("--mac-address=%s", mac), "busybox", "sh", "-c", "ipconfig /all | grep 'Physical Address' | awk '{print $12}'")

 		mac = strings.ReplaceAll(strings.ToUpper(mac), ":", "-") // To Windows-style MACs

 	} else {

@@ -2184,7 +2184,7 @@ func (s *DockerCLIRunSuite) TestVolumesNoCopyData(c *testing.T) {

 		c.Fatalf("Data was copied on volumes-from but shouldn't be:\n%q", out)

 	}

-	tmpDir := RandomTmpDirPath("docker_test_bind_mount_copy_data", testEnv.OSType)

+	tmpDir := RandomTmpDirPath("docker_test_bind_mount_copy_data", testEnv.DaemonInfo.OSType)

 	if out, _, err := dockerCmdWithError("run", "-v", tmpDir+":/foo", "dataimage", "ls", "-lh", "/foo/bar"); err == nil || !strings.Contains(out, "No such file or directory") {

 		c.Fatalf("Data was copied on bind mount but shouldn't be:\n%q", out)

 	}

@@ -2536,7 +2536,7 @@ func (s *DockerCLIRunSuite) TestRunNonLocalMacAddress(c *testing.T) {

 	args := []string{"run", "--mac-address", addr}

 	expected := addr

-	if testEnv.OSType != "windows" {

+	if testEnv.DaemonInfo.OSType != "windows" {

 		args = append(args, "busybox", "ifconfig")

 	} else {

 		args = append(args, testEnv.PlatformDefaults.BaseImage, "ipconfig", "/all")

@@ -2632,7 +2632,7 @@ func (s *DockerCLIRunSuite) TestRunSetDefaultRestartPolicy(c *testing.T) {

 func (s *DockerCLIRunSuite) TestRunRestartMaxRetries(c *testing.T) {

 	out, _ := dockerCmd(c, "run", "-d", "--restart=on-failure:3", "busybox", "false")

 	timeout := 10 * time.Second

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		timeout = 120 * time.Second

 	}

@@ -3003,7 +3003,7 @@ func (s *DockerCLIRunSuite) TestVolumeFromMixedRWOptions(c *testing.T) {

 	dockerCmd(c, "run", "--volumes-from", "parent:ro", "--name", "test-volumes-1", "busybox", "true")

 	dockerCmd(c, "run", "--volumes-from", "parent:rw", "--name", "test-volumes-2", "busybox", "true")

-	if testEnv.OSType != "windows" {

+	if testEnv.DaemonInfo.OSType != "windows" {

 		mRO, err := inspectMountPoint("test-volumes-1", prefix+slash+"test")

 		assert.NilError(c, err, "failed to inspect mount point")

 		if mRO.RW {

@@ -3394,7 +3394,7 @@ func (s *DockerCLIRunSuite) TestRunLoopbackOnlyExistsWhenNetworkingDisabled(c *t

 // Issue #4681

 func (s *DockerCLIRunSuite) TestRunLoopbackWhenNetworkDisabled(c *testing.T) {

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		dockerCmd(c, "run", "--net=none", testEnv.PlatformDefaults.BaseImage, "ping", "-n", "1", "127.0.0.1")

 	} else {

 		dockerCmd(c, "run", "--net=none", "busybox", "ping", "-c", "1", "127.0.0.1")

@@ -3660,7 +3660,7 @@ func (s *DockerCLIRunSuite) TestRunNonExistingCmd(c *testing.T) {

 // as that's when the check is made (and yes, by its design...)

 func (s *DockerCLIRunSuite) TestCmdCannotBeInvoked(c *testing.T) {

 	expected := 126

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		expected = 127

 	}

 	name := "testCmdCannotBeInvoked"

@@ -25,7 +25,7 @@ func (s *DockerCLITopSuite) TestTopMultipleArgs(c *testing.T) {

 	cleanedContainerID := strings.TrimSpace(out)

 	var expected icmd.Expected

-	switch testEnv.OSType {

+	switch testEnv.DaemonInfo.OSType {

 	case "windows":

 		expected = icmd.Expected{ExitCode: 1, Err: "Windows does not support arguments to top"}

 	default:

@@ -46,7 +46,7 @@ func (s *DockerCLITopSuite) TestTopNonPrivileged(c *testing.T) {

 	// Windows will list the name of the launched executable which in this case is busybox.exe, without the parameters.

 	// Linux will display the command executed in the container

 	var lookingFor string

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		lookingFor = "busybox.exe"

 	} else {

 		lookingFor = "top"

@@ -41,7 +41,7 @@ func (s *DockerAPISuite) TestDeprecatedContainerAPIStartVolumeBinds(c *testing.T

 	// TODO Windows CI: Investigate further why this fails on Windows to Windows CI.

 	testRequires(c, DaemonIsLinux)

 	path := "/foo"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		path = `c:\foo`

 	}

 	name := "testing"

@@ -54,7 +54,7 @@ func (s *DockerAPISuite) TestDeprecatedContainerAPIStartVolumeBinds(c *testing.T

 	assert.NilError(c, err)

 	assert.Equal(c, res.StatusCode, http.StatusCreated)

-	bindPath := RandomTmpDirPath("test", testEnv.OSType)

+	bindPath := RandomTmpDirPath("test", testEnv.DaemonInfo.OSType)

 	config = map[string]interface{}{

 		"Binds": []string{bindPath + ":" + path},

 	}

@@ -81,8 +81,8 @@ func (s *DockerAPISuite) TestDeprecatedContainerAPIStartDupVolumeBinds(c *testin

 	assert.NilError(c, err)

 	assert.Equal(c, res.StatusCode, http.StatusCreated)

-	bindPath1 := RandomTmpDirPath("test1", testEnv.OSType)

-	bindPath2 := RandomTmpDirPath("test2", testEnv.OSType)

+	bindPath1 := RandomTmpDirPath("test1", testEnv.DaemonInfo.OSType)

+	bindPath2 := RandomTmpDirPath("test2", testEnv.DaemonInfo.OSType)

 	config = map[string]interface{}{

 		"Binds": []string{bindPath1 + ":/tmp", bindPath2 + ":/tmp"},

@@ -23,7 +23,7 @@ func ensureSyscallTest(c *testing.T) {

 	// if no match, must build in docker, which is significantly slower

 	// (slower mostly because of the vfs graphdriver)

-	if testEnv.OSType != runtime.GOOS {

+	if testEnv.DaemonInfo.OSType != runtime.GOOS {

 		ensureSyscallTestBuild(c)

 		return

 	}

@@ -86,7 +86,7 @@ func ensureNNPTest(c *testing.T) {

 	// if no match, must build in docker, which is significantly slower

 	// (slower mostly because of the vfs graphdriver)

-	if testEnv.OSType != runtime.GOOS {

+	if testEnv.DaemonInfo.OSType != runtime.GOOS {

 		ensureNNPTestBuild(c)

 		return

 	}

@@ -24,11 +24,11 @@ func ArchitectureIsNot(arch string) bool {

 }

 func DaemonIsWindows() bool {

-	return testEnv.OSType == "windows"

+	return testEnv.DaemonInfo.OSType == "windows"

 }

 func DaemonIsLinux() bool {

-	return testEnv.OSType == "linux"

+	return testEnv.DaemonInfo.OSType == "linux"

 }

 func MinimumAPIVersion(version string) func() bool {

@@ -153,7 +153,7 @@ func UserNamespaceInKernel() bool {

 }

 func IsPausable() bool {

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		return testEnv.DaemonInfo.Isolation.IsHyperV()

 	}

 	return true

@@ -4,7 +4,7 @@ package main

 // the command is for a sleeping container based on the daemon platform.

 // The Windows busybox image does not have a `top` command.

 func sleepCommandForDaemonPlatform() []string {

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		return []string{"sleep", "240"}

 	}

 	return []string{"top"}

@@ -14,7 +14,7 @@ import (

 )

 func getPrefixAndSlashFromDaemonPlatform() (prefix, slash string) {

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		return "c:", `\`

 	}

 	return "", "/"

@@ -20,7 +20,7 @@ import (

 )

 func TestCreateWithCDIDevices(t *testing.T) {

-	skip.If(t, testEnv.OSType != "linux", "CDI devices are only supported on Linux")

+	skip.If(t, testEnv.DaemonInfo.OSType != "linux", "CDI devices are only supported on Linux")

 	skip.If(t, testEnv.IsRemoteDaemon, "cannot run cdi tests with a remote daemon")

 	cwd, err := os.Getwd()

@@ -42,7 +42,7 @@ func TestCopyFromContainerPathIsNotDir(t *testing.T) {

 	path := "/etc/passwd/"

 	expected := "not a directory"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		path = "c:/windows/system32/drivers/etc/hosts/"

 		expected = "The filename, directory name, or volume label syntax is incorrect."

 	}

@@ -127,7 +127,7 @@ func TestCopyToContainerPathIsNotDir(t *testing.T) {

 	cid := container.Create(ctx, t, apiclient)

 	path := "/etc/passwd/"

-	if testEnv.OSType == "windows" {

+	if testEnv.DaemonInfo.OSType == "windows" {

 		path = "c:/windows/system32/drivers/etc/hosts/"

 	}

 	err := apiclient.CopyToContainer(ctx, cid, path, nil, types.CopyToContainerOptions{})

@@ -514,7 +514,7 @@ func TestCreatePlatformSpecificImageNoPlatform(t *testing.T) {

 	defer setupTest(t)()

 	skip.If(t, testEnv.DaemonInfo.Architecture == "arm", "test only makes sense to run on non-arm systems")

-	skip.If(t, testEnv.OSType != "linux", "test image is only available on linux")

+	skip.If(t, testEnv.DaemonInfo.OSType != "linux", "test image is only available on linux")

 	cli := testEnv.APIClient()

 	_, err := cli.ContainerCreate(

@@ -13,7 +13,7 @@ import (

 )