@@ -129,7 +129,7 @@ func (s *DockerRegistrySuite) SetUpTest(c *check.C) {

 	testRequires(c, DaemonIsLinux, registry.Hosting, SameHostDaemon)

 	s.reg = setupRegistry(c, false, "", "")

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 }

@@ -163,7 +163,7 @@ func (s *DockerSchema1RegistrySuite) SetUpTest(c *check.C) {

 	testRequires(c, DaemonIsLinux, registry.Hosting, NotArm64, SameHostDaemon)

 	s.reg = setupRegistry(c, true, "", "")

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 }

@@ -197,7 +197,7 @@ func (s *DockerRegistryAuthHtpasswdSuite) SetUpTest(c *check.C) {

 	testRequires(c, DaemonIsLinux, registry.Hosting, SameHostDaemon)

 	s.reg = setupRegistry(c, false, "htpasswd", "")

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 }

@@ -232,7 +232,7 @@ func (s *DockerRegistryAuthTokenSuite) OnTimeout(c *check.C) {

 func (s *DockerRegistryAuthTokenSuite) SetUpTest(c *check.C) {

 	testRequires(c, DaemonIsLinux, registry.Hosting, SameHostDaemon)

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 }

@@ -273,7 +273,7 @@ func (s *DockerDaemonSuite) OnTimeout(c *check.C) {

 func (s *DockerDaemonSuite) SetUpTest(c *check.C) {

 	testRequires(c, DaemonIsLinux, SameHostDaemon)

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 }

@@ -331,7 +331,7 @@ func (s *DockerSwarmSuite) SetUpTest(c *check.C) {

 func (s *DockerSwarmSuite) AddDaemon(c *check.C, joinSwarm, manager bool) *daemon.Swarm {

 	d := &daemon.Swarm{

 		Daemon: daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-			Experimental: testEnv.ExperimentalDaemon(),

+			Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 		}),

 		Port: defaultSwarmPort + s.portIndex,

 	}

@@ -30,7 +30,7 @@ func (s *DockerSuite) TestBuildAPIDockerFileRemote(c *check.C) {

 	testRequires(c, NotUserNamespace)

 	var testD string

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		testD = `FROM busybox

 RUN find / -name ba*

 RUN find /tmp/`

@@ -1016,7 +1016,7 @@ func (s *DockerSuite) TestContainerAPIWait(c *check.C) {

 	name := "test-api-wait"

 	sleepCmd := "/bin/sleep"

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		sleepCmd = "sleep"

 	}

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

@@ -1216,7 +1216,7 @@ func (s *DockerSuite) TestContainerAPIDeleteRemoveVolume(c *check.C) {

 	testRequires(c, SameHostDaemon)

 	vol := "/testvolume"

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		vol = `c:\testvolume`

 	}

@@ -1890,7 +1890,7 @@ func (s *DockerSuite) TestContainersAPICreateMountsCreate(c *check.C) {

 	var (

 		testImg string

 	)

-	if testEnv.DaemonPlatform() != "windows" {

+	if testEnv.OSType != "windows" {

 		testImg = "test-mount-config"

 		buildImageSuccessfully(c, testImg, build.WithDockerfile(`

 	FROM busybox

@@ -1987,7 +1987,7 @@ func (s *DockerSuite) TestContainersAPICreateMountsCreate(c *check.C) {

 		}

 	}

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

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

 		cases = append(cases, []testCase{

 			{

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

@@ -47,7 +47,7 @@ func (s *DockerSuite) TestContainersAPICreateMountsBindNamedPipe(c *check.C) {

 	name := "test-bind-npipe"

 	data := map[string]interface{}{

-		"Image":      testEnv.MinimalBaseImage(),

+		"Image":      testEnv.PlatformDefaults.BaseImage,

 		"Cmd":        []string{"cmd", "/c", cmd},

 		"HostConfig": map[string]interface{}{"Mounts": []map[string]interface{}{{"Type": "npipe", "Source": hostPipeName, "Target": containerPipeName}}},

 	}

@@ -80,7 +80,7 @@ func (s *DockerSuite) TestAPIImagesDelete(c *check.C) {

 	c.Assert(err, checker.IsNil)

 	defer cli.Close()

-	if testEnv.DaemonPlatform() != "windows" {

+	if testEnv.OSType != "windows" {

 		testRequires(c, Network)

 	}

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

@@ -104,7 +104,7 @@ func (s *DockerSuite) TestAPIImagesHistory(c *check.C) {

 	c.Assert(err, checker.IsNil)

 	defer cli.Close()

-	if testEnv.DaemonPlatform() != "windows" {

+	if testEnv.OSType != "windows" {

 		testRequires(c, Network)

 	}

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

@@ -28,7 +28,7 @@ func (s *DockerSuite) TestInspectAPIContainerResponse(c *check.C) {

 	var cases []acase

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		cases = []acase{

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

 		}

@@ -39,7 +39,7 @@ func (s *DockerSuite) TestAPIStatsNoStreamGetCpu(c *check.C) {

 	var cpuPercent = 0.0

-	if testEnv.DaemonPlatform() != "windows" {

+	if testEnv.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

@@ -105,7 +105,7 @@ func (s *DockerSuite) TestAPIStatsNetworkStats(c *check.C) {

 	// Retrieve the container address

 	net := "bridge"

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		net = "nat"

 	}

 	contIP := findContainerIP(c, id, net)

@@ -153,7 +153,7 @@ func (s *DockerSuite) TestAPIStatsNetworkStats(c *check.C) {

 	// On Linux, account for ARP.

 	expRxPkts := preRxPackets + uint64(numPings)

 	expTxPkts := preTxPackets + uint64(numPings)

-	if testEnv.DaemonPlatform() != "windows" {

+	if testEnv.OSType != "windows" {

 		expRxPkts++

 		expTxPkts++

 	}

@@ -33,7 +33,7 @@ func (s *DockerSuite) TestAPIGetEnabledCORS(c *check.C) {

 }

 func (s *DockerSuite) TestAPIClientVersionOldNotSupported(c *check.C) {

-	if testEnv.DaemonPlatform() != runtime.GOOS {

+	if testEnv.OSType != runtime.GOOS {

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

 	}

 	if api.MinVersion == api.DefaultVersion {

@@ -40,7 +40,7 @@ func (s *DockerSuite) TestBuildJSONEmptyRun(c *check.C) {

 func (s *DockerSuite) TestBuildShCmdJSONEntrypoint(c *check.C) {

 	name := "testbuildshcmdjsonentrypoint"

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

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		expected = "cmd /S /C echo test"

 	}

@@ -78,7 +78,7 @@ func (s *DockerSuite) TestBuildEnvironmentReplacementVolume(c *check.C) {

 	var volumePath string

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		volumePath = "c:/quux"

 	} else {

 		volumePath = "/quux"

@@ -135,7 +135,7 @@ func (s *DockerSuite) TestBuildEnvironmentReplacementWorkdir(c *check.C) {

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

 	expected := `"/work"`

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		expected = `"C:\\work"`

 	}

 	if res != expected {

@@ -610,7 +610,7 @@ RUN [ $(cat "/test dir/test_file6") = 'test6' ]`, command, command, command, com

 func (s *DockerSuite) TestBuildCopyFileWithWhitespaceOnWindows(c *check.C) {

 	testRequires(c, DaemonIsWindows)

-	dockerfile := `FROM ` + testEnv.MinimalBaseImage() + `

+	dockerfile := `FROM ` + testEnv.PlatformDefaults.BaseImage + `

 RUN mkdir "C:/test dir"

 RUN mkdir "C:/test_dir"

 COPY [ "test file1", "/test_file1" ]

@@ -1311,7 +1311,7 @@ func (s *DockerSuite) TestBuildRelativeWorkdir(c *check.C) {

 		expectedFinal string

 	)

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		expected1 = `C:/`

 		expected2 = `C:/test1`

 		expected3 = `C:/test2`

@@ -1390,7 +1390,7 @@ func (s *DockerSuite) TestBuildWorkdirWithEnvVariables(c *check.C) {

 	name := "testbuildworkdirwithenvvariables"

 	var expected string

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		expected = `C:\test1\test2`

 	} else {

 		expected = `/test1/test2`

@@ -1412,7 +1412,7 @@ func (s *DockerSuite) TestBuildRelativeCopy(c *check.C) {

 	testRequires(c, NotUserNamespace)

 	var expected string

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		expected = `C:/test1/test2`

 	} else {

 		expected = `/test1/test2`

@@ -1521,7 +1521,7 @@ func (s *DockerSuite) TestBuildContextCleanup(c *check.C) {

 	testRequires(c, SameHostDaemon)

 	name := "testbuildcontextcleanup"

-	entries, err := ioutil.ReadDir(filepath.Join(testEnv.DockerBasePath(), "tmp"))

+	entries, err := ioutil.ReadDir(filepath.Join(testEnv.DaemonInfo.DockerRootDir, "tmp"))

 	if err != nil {

 		c.Fatalf("failed to list contents of tmp dir: %s", err)

 	}

@@ -1529,7 +1529,7 @@ func (s *DockerSuite) TestBuildContextCleanup(c *check.C) {

 	buildImageSuccessfully(c, name, build.WithDockerfile(`FROM `+minimalBaseImage()+`

         ENTRYPOINT ["/bin/echo"]`))

-	entriesFinal, err := ioutil.ReadDir(filepath.Join(testEnv.DockerBasePath(), "tmp"))

+	entriesFinal, err := ioutil.ReadDir(filepath.Join(testEnv.DaemonInfo.DockerRootDir, "tmp"))

 	if err != nil {

 		c.Fatalf("failed to list contents of tmp dir: %s", err)

 	}

@@ -1543,7 +1543,7 @@ func (s *DockerSuite) TestBuildContextCleanupFailedBuild(c *check.C) {

 	testRequires(c, SameHostDaemon)

 	name := "testbuildcontextcleanup"

-	entries, err := ioutil.ReadDir(filepath.Join(testEnv.DockerBasePath(), "tmp"))

+	entries, err := ioutil.ReadDir(filepath.Join(testEnv.DaemonInfo.DockerRootDir, "tmp"))

 	if err != nil {

 		c.Fatalf("failed to list contents of tmp dir: %s", err)

 	}

@@ -1553,7 +1553,7 @@ func (s *DockerSuite) TestBuildContextCleanupFailedBuild(c *check.C) {

 		ExitCode: 1,

 	})

-	entriesFinal, err := ioutil.ReadDir(filepath.Join(testEnv.DockerBasePath(), "tmp"))

+	entriesFinal, err := ioutil.ReadDir(filepath.Join(testEnv.DaemonInfo.DockerRootDir, "tmp"))

 	if err != nil {

 		c.Fatalf("failed to list contents of tmp dir: %s", err)

 	}

@@ -2196,7 +2196,7 @@ func (s *DockerSuite) TestBuildAddFileNotFound(c *check.C) {

 	name := "testbuildaddnotfound"

 	expected := "foo: no such file or directory"

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		expected = "foo: The system cannot find the file specified"

 	}

@@ -2250,7 +2250,7 @@ func (s *DockerSuite) TestBuildOnBuild(c *check.C) {

 // gh #2446

 func (s *DockerSuite) TestBuildAddToSymlinkDest(c *check.C) {

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

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

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

 	}

 	name := "testbuildaddtosymlinkdest"

@@ -3205,7 +3205,7 @@ func (s *DockerSuite) TestBuildCmdShDashC(c *check.C) {

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

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

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

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

 	}

 	if res != expected {

@@ -3278,7 +3278,7 @@ func (s *DockerSuite) TestBuildEntrypointCanBeOverriddenByChildInspect(c *check.

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

 	)

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

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

 	}

@@ -3335,7 +3335,7 @@ func (s *DockerSuite) TestBuildVerifySingleQuoteFails(c *check.C) {

 	// it should barf on it.

 	name := "testbuildsinglequotefails"

 	expectedExitCode := 2

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		expectedExitCode = 127

 	}

@@ -3351,7 +3351,7 @@ func (s *DockerSuite) TestBuildVerboseOut(c *check.C) {

 	name := "testbuildverboseout"

 	expected := "\n123\n"

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		expected = "\n123\r\n"

 	}

@@ -3367,7 +3367,7 @@ func (s *DockerSuite) TestBuildWithTabs(c *check.C) {

 	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.DaemonPlatform() == "windows" {

+	if testEnv.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

 	}

@@ -3562,7 +3562,7 @@ func (s *DockerSuite) TestBuildStderr(c *check.C) {

 	result.Assert(c, icmd.Success)

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

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

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

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

 	}

@@ -3674,7 +3674,7 @@ func (s *DockerSuite) TestBuildVolumesRetainContents(c *check.C) {

 		volName  = "/foo"

 	)

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		volName = "C:/foo"

 	}

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

 	expected := "\n    foo  \n"

 	// Windows uses the builtin echo, which preserves quotes

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		expected = "\"    foo  \""

 	}

@@ -4009,7 +4009,7 @@ func (s *DockerSuite) TestBuildMissingArgs(c *check.C) {

 		"INSERT":     {},

 	}

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		skipCmds = map[string]struct{}{

 			"CMD":        {},

 			"RUN":        {},

@@ -4142,7 +4142,7 @@ func (s *DockerSuite) TestBuildRUNErrMsg(c *check.C) {

 	name := "testbuildbadrunerrmsg"

 	shell := "/bin/sh -c"

 	exitCode := 127

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		shell = "cmd /S /C"

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

 		exitCode = 1

@@ -4294,7 +4294,7 @@ func (s *DockerTrustSuite) TestTrustedBuildTagIgnoresOtherDelegationRoles(c *che

 func (s *DockerSuite) TestBuildNullStringInAddCopyVolume(c *check.C) {

 	name := "testbuildnullstringinaddcopyvolume"

 	volName := "nullvolume"

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		volName = `C:\\nullvolume`

 	}

@@ -4334,7 +4334,7 @@ func (s *DockerSuite) TestBuildBuildTimeArg(c *check.C) {

 	envKey := "foo"

 	envVal := "bar"

 	var dockerfile string

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

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

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

 			ARG %s

@@ -4949,7 +4949,7 @@ func (s *DockerSuite) TestBuildMultiStageUnusedArg(c *check.C) {

 func (s *DockerSuite) TestBuildNoNamedVolume(c *check.C) {

 	volName := "testname:/foo"

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		volName = "testname:C:\\foo"

 	}

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

@@ -5155,7 +5155,7 @@ func (s *DockerSuite) TestBuildWorkdirWindowsPath(c *check.C) {

 	testRequires(c, DaemonIsWindows)

 	name := "testbuildworkdirwindowspath"

 	buildImageSuccessfully(c, name, build.WithDockerfile(`

-	FROM `+testEnv.MinimalBaseImage()+`

+	FROM `+testEnv.PlatformDefaults.BaseImage+`

 	RUN mkdir C:\\work

 	WORKDIR C:\\work

 	RUN if "%CD%" NEQ "C:\work" exit -1

@@ -6150,7 +6150,7 @@ func (s *DockerTrustSuite) TestBuildMultiStageTrusted(c *check.C) {

 func (s *DockerSuite) TestBuildMultiStageMultipleBuildsWindows(c *check.C) {

 	testRequires(c, DaemonIsWindows)

 	dockerfile := `

-		FROM ` + testEnv.MinimalBaseImage() + `

+		FROM ` + testEnv.PlatformDefaults.BaseImage + `

 		COPY foo c:\\bar`

 	ctx := fakecontext.New(c, "",

 		fakecontext.WithDockerfile(dockerfile),

@@ -6163,7 +6163,7 @@ func (s *DockerSuite) TestBuildMultiStageMultipleBuildsWindows(c *check.C) {

 	dockerfile = `

 		FROM build1:latest

-    	FROM ` + testEnv.MinimalBaseImage() + `

+    	FROM ` + testEnv.PlatformDefaults.BaseImage + `

 		COPY --from=0 c:\\bar /

 		COPY foo /`

 	ctx = fakecontext.New(c, "",

@@ -6184,8 +6184,8 @@ func (s *DockerSuite) TestBuildMultiStageMultipleBuildsWindows(c *check.C) {

 func (s *DockerSuite) TestBuildCopyFromForbidWindowsSystemPaths(c *check.C) {

 	testRequires(c, DaemonIsWindows)

 	dockerfile := `

-		FROM ` + testEnv.MinimalBaseImage() + `

-		FROM ` + testEnv.MinimalBaseImage() + `

+		FROM ` + testEnv.PlatformDefaults.BaseImage + `

+		FROM ` + testEnv.PlatformDefaults.BaseImage + `

 		COPY --from=0 %s c:\\oscopy

 		`

 	exp := icmd.Expected{

@@ -6201,8 +6201,8 @@ func (s *DockerSuite) TestBuildCopyFromForbidWindowsSystemPaths(c *check.C) {

 func (s *DockerSuite) TestBuildCopyFromForbidWindowsRelativePaths(c *check.C) {

 	testRequires(c, DaemonIsWindows)

 	dockerfile := `

-		FROM ` + testEnv.MinimalBaseImage() + `

-		FROM ` + testEnv.MinimalBaseImage() + `

+		FROM ` + testEnv.PlatformDefaults.BaseImage + `

+		FROM ` + testEnv.PlatformDefaults.BaseImage + `

 		COPY --from=0 %s c:\\oscopy

 		`

 	exp := icmd.Expected{

@@ -6219,9 +6219,9 @@ func (s *DockerSuite) TestBuildCopyFromForbidWindowsRelativePaths(c *check.C) {

 func (s *DockerSuite) TestBuildCopyFromWindowsIsCaseInsensitive(c *check.C) {

 	testRequires(c, DaemonIsWindows)

 	dockerfile := `

-		FROM ` + testEnv.MinimalBaseImage() + `

+		FROM ` + testEnv.PlatformDefaults.BaseImage + `

 		COPY foo /

-		FROM ` + testEnv.MinimalBaseImage() + `

+		FROM ` + testEnv.PlatformDefaults.BaseImage + `

 		COPY --from=0 c:\\fOo c:\\copied

 		RUN type c:\\copied

 		`

@@ -6301,7 +6301,7 @@ func (s *DockerSuite) TestBuildOpaqueDirectory(c *check.C) {

 func (s *DockerSuite) TestBuildWindowsUser(c *check.C) {

 	testRequires(c, DaemonIsWindows)

 	name := "testbuildwindowsuser"

-	buildImage(name, build.WithDockerfile(`FROM `+testEnv.MinimalBaseImage()+`

+	buildImage(name, build.WithDockerfile(`FROM `+testEnv.PlatformDefaults.BaseImage+`

 		RUN net user user /add

 		USER user

 		RUN set username

@@ -6332,7 +6332,7 @@ func (s *DockerSuite) TestBuildWindowsEnvCaseInsensitive(c *check.C) {

 	testRequires(c, DaemonIsWindows)

 	name := "testbuildwindowsenvcaseinsensitive"

 	buildImageSuccessfully(c, name, build.WithDockerfile(`

-		FROM `+testEnv.MinimalBaseImage()+`

+		FROM `+testEnv.PlatformDefaults.BaseImage+`

 		ENV FOO=bar foo=baz

   `))

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

@@ -6352,7 +6352,7 @@ WORKDIR /foo/bar

 	// The Windows busybox image has a blank `cmd`

 	lookingFor := `["sh"]`

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		lookingFor = "null"

 	}

 	c.Assert(strings.TrimSpace(out), checker.Equals, lookingFor)

@@ -635,7 +635,7 @@ func (s *DockerRegistrySuite) TestPullFailsWithAlteredLayer(c *check.C) {

 	// digest verification for the target layer digest.

 	// Remove distribution cache to force a re-pull of the blobs

-	if err := os.RemoveAll(filepath.Join(testEnv.DockerBasePath(), "image", s.d.StorageDriver(), "distribution")); err != nil {

+	if err := os.RemoveAll(filepath.Join(testEnv.DaemonInfo.DockerRootDir, "image", s.d.StorageDriver(), "distribution")); err != nil {

 		c.Fatalf("error clearing distribution cache: %v", err)

 	}

@@ -678,7 +678,7 @@ func (s *DockerSchema1RegistrySuite) TestPullFailsWithAlteredLayer(c *check.C) {

 	// digest verification for the target layer digest.

 	// Remove distribution cache to force a re-pull of the blobs

-	if err := os.RemoveAll(filepath.Join(testEnv.DockerBasePath(), "image", s.d.StorageDriver(), "distribution")); err != nil {

+	if err := os.RemoveAll(filepath.Join(testEnv.DaemonInfo.DockerRootDir, "image", s.d.StorageDriver(), "distribution")); err != nil {

 		c.Fatalf("error clearing distribution cache: %v", err)

 	}

@@ -125,7 +125,7 @@ func (s *DockerSuite) TestCommitChange(c *check.C) {

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

 	// the ordering is the same as the cli.

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

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

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

 	}

@@ -64,7 +64,7 @@ func (s *DockerSuite) TestCpCheckDestOwnership(c *check.C) {

 }

 func getRootUIDGID() (int, int, error) {

-	uidgid := strings.Split(filepath.Base(testEnv.DockerBasePath()), ".")

+	uidgid := strings.Split(filepath.Base(testEnv.DaemonInfo.DockerRootDir), ".")

 	if len(uidgid) == 1 {

 		//user namespace remapping is not turned on; return 0

 		return 0, 0, nil

@@ -60,7 +60,7 @@ func (s *DockerSuite) TestCreateArgs(c *check.C) {

 // Make sure we can grow the container's rootfs at creation time.

 func (s *DockerSuite) TestCreateGrowRootfs(c *check.C) {

 	// Windows and Devicemapper support growing the rootfs

-	if testEnv.DaemonPlatform() != "windows" {

+	if testEnv.OSType != "windows" {

 		testRequires(c, Devicemapper)

 	}

 	out, _ := dockerCmd(c, "create", "--storage-opt", "size=120G", "busybox")

@@ -224,8 +224,8 @@ func (s *DockerSuite) TestCreateLabelFromImage(c *check.C) {

 func (s *DockerSuite) TestCreateHostnameWithNumber(c *check.C) {

 	image := "busybox"

 	// Busybox on Windows does not implement hostname command

-	if testEnv.DaemonPlatform() == "windows" {

-		image = testEnv.MinimalBaseImage()

+	if testEnv.OSType == "windows" {

+		image = testEnv.PlatformDefaults.BaseImage

 	}

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

 	c.Assert(strings.TrimSpace(out), checker.Equals, "web.0", check.Commentf("hostname not set, expected `web.0`, got: %s", out))

@@ -378,7 +378,7 @@ func (s *DockerSuite) TestCreateWithWorkdir(c *check.C) {

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

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

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		dockerCmd(c, "start", name)

 	}

 	dockerCmd(c, "cp", fmt.Sprintf("%s:%s", name, dir), prefix+slash+"tmp")

@@ -1433,7 +1433,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithSocketAsVolume(c *check.C) {

 // A subsequent daemon restart should clean up said mounts.

 func (s *DockerDaemonSuite) TestCleanupMountsAfterDaemonAndContainerKill(c *check.C) {

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 	d.StartWithBusybox(c)

@@ -1473,7 +1473,7 @@ func (s *DockerDaemonSuite) TestCleanupMountsAfterDaemonAndContainerKill(c *chec

 // os.Interrupt should perform a graceful daemon shutdown and hence cleanup mounts.

 func (s *DockerDaemonSuite) TestCleanupMountsAfterGracefulShutdown(c *check.C) {

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 	d.StartWithBusybox(c)

@@ -1694,7 +1694,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartLocalVolumes(c *check.C) {

 // FIXME(vdemeester) should be a unit test

 func (s *DockerDaemonSuite) TestDaemonCorruptedLogDriverAddress(c *check.C) {

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 	c.Assert(d.StartWithError("--log-driver=syslog", "--log-opt", "syslog-address=corrupted:42"), check.NotNil)

 	expected := "Failed to set log opts: syslog-address should be in form proto://address"

@@ -1704,7 +1704,7 @@ func (s *DockerDaemonSuite) TestDaemonCorruptedLogDriverAddress(c *check.C) {

 // FIXME(vdemeester) should be a unit test

 func (s *DockerDaemonSuite) TestDaemonCorruptedFluentdAddress(c *check.C) {

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 	c.Assert(d.StartWithError("--log-driver=fluentd", "--log-opt", "fluentd-address=corrupted:c"), check.NotNil)

 	expected := "Failed to set log opts: invalid fluentd-address corrupted:c: "

@@ -3081,7 +3081,7 @@ func (s *DockerDaemonSuite) TestDaemonIpcModeShareableFromConfig(c *check.C) {

 func testDaemonStartIpcMode(c *check.C, from, mode string, valid bool) {

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 	c.Logf("Checking IpcMode %s set from %s\n", mode, from)

 	var serr error

@@ -20,7 +20,7 @@ func (s *DockerSuite) TestDiffFilenameShownInOutput(c *check.C) {

 	// a "Files/" prefix.

 	containerID := strings.TrimSpace(out)

 	lookingFor := "A /foo/bar"

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

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

 		lookingFor = "C Files/foo/bar"

 	}

@@ -659,7 +659,7 @@ func (s *DockerSuite) TestEventsContainerRestart(c *check.C) {

 	// wait until test2 is auto removed.

 	waitTime := 10 * time.Second

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		// Windows takes longer...

 		waitTime = 90 * time.Second

 	}

@@ -53,7 +53,7 @@ type graphEventsCounter struct {

 func (s *DockerExternalGraphdriverSuite) SetUpTest(c *check.C) {

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 }

@@ -52,7 +52,7 @@ type DockerExternalVolumeSuite struct {

 func (s *DockerExternalVolumeSuite) SetUpTest(c *check.C) {

 	testRequires(c, SameHostDaemon)

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 	s.ec = &eventCounter{}

 }

@@ -36,7 +36,7 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {

 		"Live Restore Enabled:",

 	}

-	if testEnv.DaemonPlatform() == "linux" {

+	if testEnv.OSType == "linux" {

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

 	}

@@ -44,7 +44,7 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {

 		stringsToCheck = append(stringsToCheck, "Runtimes:", "Default Runtime: runc")

 	}

-	if testEnv.ExperimentalDaemon() {

+	if testEnv.DaemonInfo.ExperimentalBuild {

 		stringsToCheck = append(stringsToCheck, "Experimental: true")

 	} else {

 		stringsToCheck = append(stringsToCheck, "Experimental: false")

@@ -72,7 +72,7 @@ func (s *DockerSuite) TestInfoDiscoveryBackend(c *check.C) {

 	testRequires(c, SameHostDaemon, DaemonIsLinux)

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 	discoveryBackend := "consul://consuladdr:consulport/some/path"

 	discoveryAdvertise := "1.1.1.1:2375"

@@ -91,7 +91,7 @@ func (s *DockerSuite) TestInfoDiscoveryInvalidAdvertise(c *check.C) {

 	testRequires(c, SameHostDaemon, DaemonIsLinux)

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 	discoveryBackend := "consul://consuladdr:consulport/some/path"

@@ -110,7 +110,7 @@ func (s *DockerSuite) TestInfoDiscoveryAdvertiseInterfaceName(c *check.C) {

 	testRequires(c, SameHostDaemon, Network, DaemonIsLinux)

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 	discoveryBackend := "consul://consuladdr:consulport/some/path"

 	discoveryAdvertise := "eth0"

@@ -183,7 +183,7 @@ func (s *DockerSuite) TestInfoDebug(c *check.C) {

 	testRequires(c, SameHostDaemon, DaemonIsLinux)

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 	d.Start(c, "--debug")

 	defer d.Stop(c)

@@ -206,7 +206,7 @@ func (s *DockerSuite) TestInsecureRegistries(c *check.C) {

 	registryHost := "insecurehost.com:5000"

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 	d.Start(c, "--insecure-registry="+registryCIDR, "--insecure-registry="+registryHost)

 	defer d.Stop(c)

@@ -61,7 +61,7 @@ func (s *DockerSuite) TestInspectStatus(c *check.C) {

 	// 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.DaemonPlatform() != "windows" {

+	if testEnv.OSType != "windows" {

 		dockerCmd(c, "pause", out)

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

 		c.Assert(inspectOut, checker.Equals, "paused")

@@ -206,7 +206,7 @@ func (s *DockerSuite) TestInspectContainerGraphDriver(c *check.C) {

 func (s *DockerSuite) TestInspectBindMountPoint(c *check.C) {

 	modifier := ",z"

 	prefix, slash := getPrefixAndSlashFromDaemonPlatform()

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		modifier = ""

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

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

@@ -229,7 +229,7 @@ func (s *DockerSuite) TestInspectBindMountPoint(c *check.C) {

 	c.Assert(m.Driver, checker.Equals, "")

 	c.Assert(m.Source, checker.Equals, prefix+slash+"data")

 	c.Assert(m.Destination, checker.Equals, prefix+slash+"data")

-	if testEnv.DaemonPlatform() != "windows" { // Windows does not set mode

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

 		c.Assert(m.Mode, checker.Equals, "ro"+modifier)

 	}

 	c.Assert(m.RW, checker.Equals, false)

@@ -50,7 +50,7 @@ type DockerNetworkSuite struct {

 func (s *DockerNetworkSuite) SetUpTest(c *check.C) {

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: testEnv.ExperimentalDaemon(),

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

 	})

 }

@@ -55,7 +55,7 @@ func (ps *DockerPluginSuite) TestPluginBasicOps(c *check.C) {

 	c.Assert(err, checker.IsNil)

 	c.Assert(out, checker.Contains, plugin)

-	_, err = os.Stat(filepath.Join(testEnv.DockerBasePath(), "plugins", id))

+	_, err = os.Stat(filepath.Join(testEnv.DaemonInfo.DockerRootDir, "plugins", id))

 	if !os.IsNotExist(err) {

 		c.Fatal(err)

 	}

@@ -506,14 +506,14 @@ func (s *DockerSuite) TestPluginUpgrade(c *check.C) {

 	id := strings.TrimSpace(out)

 	// make sure "v2" does not exists

-	_, err = os.Stat(filepath.Join(testEnv.DockerBasePath(), "plugins", id, "rootfs", "v2"))

+	_, err = os.Stat(filepath.Join(testEnv.DaemonInfo.DockerRootDir, "plugins", id, "rootfs", "v2"))

 	c.Assert(os.IsNotExist(err), checker.True, check.Commentf(out))

 	dockerCmd(c, "plugin", "disable", "-f", plugin)

 	dockerCmd(c, "plugin", "upgrade", "--grant-all-permissions", "--skip-remote-check", plugin, pluginV2)

 	// make sure "v2" file exists

-	_, err = os.Stat(filepath.Join(testEnv.DockerBasePath(), "plugins", id, "rootfs", "v2"))

+	_, err = os.Stat(filepath.Join(testEnv.DaemonInfo.DockerRootDir, "plugins", id, "rootfs", "v2"))

 	c.Assert(err, checker.IsNil)

 	dockerCmd(c, "plugin", "enable", plugin)

@@ -216,7 +216,7 @@ func (s *DockerSuite) TestPsListContainersFilterStatus(c *check.C) {

 	})

 	// Windows doesn't support pausing of containers

-	if testEnv.DaemonPlatform() != "windows" {

+	if testEnv.OSType != "windows" {

 		// pause running container

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

 		pausedID := strings.TrimSpace(out)

@@ -93,7 +93,7 @@ func (s *DockerSuite) TestRenameAnonymousContainer(c *check.C) {

 	dockerCmd(c, "start", "container1")

 	count := "-c"

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		count = "-n"

 	}

@@ -269,7 +269,7 @@ func (s *DockerSuite) TestRestartContainerwithRestartPolicy(c *check.C) {

 	id1 := strings.TrimSpace(string(out1))

 	id2 := strings.TrimSpace(string(out2))

 	waitTimeout := 15 * time.Second

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		waitTimeout = 150 * time.Second

 	}

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

@@ -68,7 +68,7 @@ func (s *DockerSuite) TestRmiImgIDMultipleTag(c *check.C) {

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

 	// it will take a few seconds to exit

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

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

 	}

@@ -109,7 +109,7 @@ func (s *DockerSuite) TestRmiImgIDForce(c *check.C) {

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

 	// it will take a few seconds to exit

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

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

 	}

@@ -72,10 +72,10 @@ func (s *DockerSuite) TestRunLeakyFileDescriptors(c *check.C) {

 // this will fail when Internet access is unavailable

 func (s *DockerSuite) TestRunLookupGoogleDNS(c *check.C) {

 	testRequires(c, Network, NotArm)

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.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.MinimalBaseImage(), "powershell", "Resolve-DNSName", "google.com")

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

 	} else {

 		dockerCmd(c, "run", "busybox", "nslookup", "google.com")

 	}

@@ -137,7 +137,7 @@ func (s *DockerSuite) TestRunDetachedContainerIDPrinting(c *check.C) {

 func (s *DockerSuite) TestRunWorkingDirectory(c *check.C) {

 	dir := "/root"

 	image := "busybox"

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		dir = `C:/Windows`

 	}

@@ -160,9 +160,9 @@ func (s *DockerSuite) TestRunWorkingDirectory(c *check.C) {

 func (s *DockerSuite) TestRunWithoutNetworking(c *check.C) {

 	count := "-c"

 	image := "busybox"

-	if testEnv.DaemonPlatform() == "windows" {

+	if testEnv.OSType == "windows" {

 		count = "-n"

-		image = testEnv.MinimalBaseImage()

+		image = testEnv.PlatformDefaults.BaseImage

 	}

 	// First using the long form --net

@@ -354,8 +354,8 @@ func (s *DockerSuite) TestRunWithVolumesFromExited(c *check.C) {

 	)

 	// Create a file in a volume

-	if testEnv.DaemonPlatform() == "windows" {

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

+	if testEnv.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")

 	}

@@ -364,8 +364,8 @@ func (s *DockerSuite) TestRunWithVolumesFromExited(c *check.C) {

 	}

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

-	if testEnv.DaemonPlatform() == "windows" {

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

+	if testEnv.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")

 	}

@@ -396,7 +396,7 @@ func (s *DockerSuite) TestRunCreateVolumesInSymlinkDir(c *check.C) {

 	// 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.