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

 }

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

-	testRequires(c, DaemonIsLinux, RegistryHosting, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, RegistryHosting, testEnv.IsLocalDaemon)

 	s.reg = registry.NewV2(c)

 	s.reg.WaitReady(c)

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))

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

 }

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

-	testRequires(c, DaemonIsLinux, RegistryHosting, NotArm64, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, RegistryHosting, NotArm64, testEnv.IsLocalDaemon)

 	s.reg = registry.NewV2(c, registry.Schema1)

 	s.reg.WaitReady(c)

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))

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

 }

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

-	testRequires(c, DaemonIsLinux, RegistryHosting, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, RegistryHosting, testEnv.IsLocalDaemon)

 	s.reg = registry.NewV2(c, registry.Htpasswd)

 	s.reg.WaitReady(c)

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))

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

 }

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

-	testRequires(c, DaemonIsLinux, RegistryHosting, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, RegistryHosting, testEnv.IsLocalDaemon)

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))

 }

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

 }

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))

 }

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	if s.d != nil {

 		s.d.Stop(c)

 	}

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

 }

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 }

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

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

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	vol := "/testvolume"

 	if testEnv.OSType == "windows" {

@@ -1426,7 +1426,7 @@ func (s *DockerSuite) TestPutContainerArchiveErrSymlinkInVolumeToReadOnlyRootfs(

 	// Windows does not support read-only rootfs

 	// Requires local volume mount bind.

 	// --read-only + userns has remount issues

-	testRequires(c, SameHostDaemon, NotUserNamespace, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, NotUserNamespace, DaemonIsLinux)

 	testVol := getTestDir(c, "test-put-container-archive-err-symlink-in-volume-to-read-only-rootfs-")

 	defer os.RemoveAll(testVol)

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

 		},

 	}

-	if SameHostDaemon() {

+	if testEnv.IsLocalDaemon() {

 		tmpDir, err := ioutils.TempDir("", "test-mounts-api")

 		c.Assert(err, checker.IsNil)

 		defer os.RemoveAll(tmpDir)

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

 }

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

-	testRequires(c, NotUserNamespace, SameHostDaemon)

+	testRequires(c, NotUserNamespace, testEnv.IsLocalDaemon)

 	// also with data in the host side

 	prefix, slash := getPrefixAndSlashFromDaemonPlatform()

 	destPath := prefix + slash + "foo"

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

 		},

 	}

-	if SameHostDaemon() {

+	if testEnv.IsLocalDaemon() {

 		// setup temp dir for testing binds

 		tmpDir1, err := ioutil.TempDir("", "test-mounts-api-1")

 		c.Assert(err, checker.IsNil)

@@ -19,7 +19,7 @@ import (

 )

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

-	testRequires(c, SameHostDaemon, DaemonIsWindowsAtLeastBuild(16299)) // Named pipe support was added in RS3

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsWindowsAtLeastBuild(16299)) // Named pipe support was added in RS3

 	// Create a host pipe to map into the container

 	hostPipeName := fmt.Sprintf(`\\.\pipe\docker-cli-test-pipe-%x`, rand.Uint64())

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

 }

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	// This test checks accidental regressions. Not part of stable API.

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

 		}

 	}

-	testRequires(c, Network, SameHostDaemon)

+	testRequires(c, Network, testEnv.IsLocalDaemon)

 	server := httptest.NewServer(http.NewServeMux())

 	defer server.Close()

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

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	out := runSleepingContainer(c)

 	id := strings.TrimSpace(out)

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

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

 	// Windows doesn't support API versions less than 1.25, so no point testing 1.17 .. 1.21

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	out := runSleepingContainer(c)

 	id := strings.TrimSpace(out)

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

 }

 func (s *DockerSwarmSuite) TestAPISwarmServicesStateReporting(c *check.C) {

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	testRequires(c, DaemonIsLinux)

 	d1 := s.AddDaemon(c, true, true)

@@ -16,7 +16,7 @@ import (

 // #9860 Make sure attach ends when container ends (with no errors)

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	out, _ := dockerCmd(c, "run", "-dti", "busybox", "/bin/sh", "-c", `trap 'exit 0' SIGTERM; while true; do sleep 1; done`)

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

 // Issue #5270 - ensure we throw a better error than "unexpected EOF"

 // when we can't access files in the context.

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

-	testRequires(c, DaemonIsLinux, UnixCli, SameHostDaemon) // test uses chown/chmod: not available on windows

+	testRequires(c, DaemonIsLinux, UnixCli, testEnv.IsLocalDaemon) // test uses chown/chmod: not available on windows

 	{

 		name := "testbuildinaccessiblefiles"

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

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	name := "testbuildcontextcleanup"

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

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

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	name := "testbuildcontextcleanup"

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

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

 }

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	cgroupParent := "test"

 	data, err := ioutil.ReadFile("/proc/self/cgroup")

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

 // container.

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

 	testRequires(c, DaemonIsLinux)

-	testRequires(c, SameHostDaemon) // Requires local volume mount bind.

+	testRequires(c, testEnv.IsLocalDaemon) // Requires local volume mount bind.

 	testVol, err := ioutil.TempDir("", "test-cp-to-symlink-to-dir-")

 	c.Assert(err, checker.IsNil)

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

 // Check that cp with unprivileged user doesn't return any error

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	testRequires(c, UnixCli) // uses chmod/su: not available on windows

 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "touch "+cpTestName)

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

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

 	testRequires(c, DaemonIsLinux)

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	outDir, err := ioutil.TempDir("", "cp-test-special-files")

 	c.Assert(err, checker.IsNil)

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

 	//  stat /tmp/cp-test-volumepath851508420/test gets permission denied for the user

 	testRequires(c, NotUserNamespace)

 	testRequires(c, DaemonIsLinux)

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	tmpDir, err := ioutil.TempDir("", "cp-test-volumepath")

 	c.Assert(err, checker.IsNil)

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

 }

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "echo lololol > /te:s:t")

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

 	//  stat /tmp/test-cp-to-symlink-destination-262430901/vol3 gets permission denied for the user

 	testRequires(c, NotUserNamespace)

 	testRequires(c, DaemonIsLinux)

-	testRequires(c, SameHostDaemon) // Requires local volume mount bind.

+	testRequires(c, testEnv.IsLocalDaemon) // Requires local volume mount bind.

 	testVol := getTestDir(c, "test-cp-to-symlink-destination-")

 	defer os.RemoveAll(testVol)

@@ -15,7 +15,7 @@ import (

 )

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	tmpDir := getTestDir(c, "test-cp-to-host-with-permissions")

 	defer os.RemoveAll(tmpDir)

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

 // Check ownership is root, both in non-userns and userns enabled modes

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	tmpVolDir := getTestDir(c, "test-cp-tmpvol")

 	containerID := makeTestContainer(c,

 		testContainerOptions{volumes: []string{fmt.Sprintf("%s:/tmpvol", tmpVolDir)}})

@@ -291,7 +291,7 @@ func containerStartOutputEquals(c *check.C, containerID, contents string) (err e

 }

 func defaultVolumes(tmpDir string) []string {

-	if SameHostDaemon() {

+	if testEnv.IsLocalDaemon() {

 		return []string{

 			"/vol1",

 			fmt.Sprintf("%s:/vol2", tmpDir),

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

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	prefix, slash := getPrefixAndSlashFromDaemonPlatform()

 	name := "test_create_volume"

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

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

 	// Uses Linux specific functionality (--ipc)

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	out, _ := dockerCmd(c, "create", "busybox")

 	id := strings.TrimSpace(out)

@@ -121,7 +121,7 @@ func (s *DockerDaemonSuite) TestDaemonShutdownLiveRestoreWithPlugins(c *check.C)

 // TestDaemonShutdownWithPlugins shuts down running plugins.

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

-	testRequires(c, IsAmd64, Network, SameHostDaemon)

+	testRequires(c, IsAmd64, Network, testEnv.IsLocalDaemon)

 	s.d.Start(c)

 	if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {

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

 // TestDaemonKillWithPlugins leaves plugins running.

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

-	testRequires(c, IsAmd64, Network, SameHostDaemon)

+	testRequires(c, IsAmd64, Network, testEnv.IsLocalDaemon)

 	s.d.Start(c)

 	if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {

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

 // that running containers are given a link-local and global IPv6 address

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

 	// IPv6 setup is messing with local bridge address.

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	// Delete the docker0 bridge if its left around from previous daemon. It has to be recreated with

 	// ipv6 enabled

 	deleteInterface(c, "docker0")

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

 // the running containers are given an IPv6 address derived from the MAC address and the ipv6 fixed CIDR

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

 	// IPv6 setup is messing with local bridge address.

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	// Delete the docker0 bridge if its left around from previous daemon. It has to be recreated with

 	// ipv6 enabled

 	deleteInterface(c, "docker0")

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

 // TestDaemonIPv6HostMode checks that when the running a container with

 // network=host the host ipv6 addresses are not removed

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	deleteInterface(c, "docker0")

 	s.d.StartWithBusybox(c, "--ipv6", "--fixed-cidr-v6=2001:db8:2::/64")

@@ -822,7 +822,7 @@ func (s *DockerDaemonSuite) TestDaemonDefaultGatewayIPv4ExplicitOutsideContainer

 }

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	// Start daemon without docker0 bridge

 	defaultNetworkBridge := "docker0"

@@ -1770,7 +1770,7 @@ func (s *DockerDaemonSuite) TestBridgeIPIsExcludedFromAllocatorPool(c *check.C)

 // Test daemon for no space left on device error

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux, Network)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux, Network)

 	testDir, err := ioutil.TempDir("", "no-space-left-on-device-test")

 	c.Assert(err, checker.IsNil)

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

 }

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	// daemon config file

 	daemonConfig := `{ "debug" : false }`

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

 // Test case for #20936, #22443

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	// daemon config file

 	configFilePath := "test.json"

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

 // Test case for #20936, #22443

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	// daemon config file

 	configFilePath := "test.json"

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

 // Test case for #21976

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	s.d.StartWithBusybox(c, "--dns", "1.2.3.4", "--dns-search", "example.com", "--dns-opt", "timeout:3")

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

 }

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	dockerProxyPath, err := exec.LookPath("docker-proxy")

 	c.Assert(err, checker.IsNil)

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

 // Test case for #22471

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	s.d.StartWithBusybox(c, "--shutdown-timeout=3")

 	_, err := s.d.Cmd("run", "-d", "busybox", "top")

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

 // Test case for #22471

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	// daemon config file

 	configFilePath := "test.json"

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

 }

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

-	testRequires(c, DaemonIsLinux, overlayFSSupported, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, overlayFSSupported, testEnv.IsLocalDaemon)

 	s.d.StartWithBusybox(c, "--live-restore", "--storage-driver", "overlay")

 	out, err := s.d.Cmd("run", "-d", "--name=top", "busybox", "top")

 	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))

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

 // #29598

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	s.d.StartWithBusybox(c, "--live-restore")

 	out, err := s.d.Cmd("run", "-d", "--restart", "always", "busybox", "top")

@@ -2939,7 +2939,7 @@ func testDaemonStartIpcMode(c *check.C, from, mode string, valid bool) {

 // arguments for default IPC mode, and bails out with incorrect ones.

 // Both CLI option (--default-ipc-mode) and config parameter are tested.

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	ipcModes := []struct {

 		mode  string

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

 // TestFailedPluginRemove makes sure that a failed plugin remove does not block

 // the daemon from starting

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

-	testRequires(c, DaemonIsLinux, IsAmd64, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, IsAmd64, testEnv.IsLocalDaemon)

 	d := daemon.New(c, dockerBinary, dockerdBinary)

 	d.Start(c)

 	cli, err := client.NewClient(d.Sock(), api.DefaultVersion, nil, nil)

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

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

 	// FIXME(vdemeester) fails on e2e run

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	since := daemonUnixTime(c)

 	name := "labelfiltertest"

 	label := "io.docker.testing=image"

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

 }

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	// daemon config file

 	configFilePath := "test.json"

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

 }

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	// daemon config file

 	configFilePath := "test.json"

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

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

 	// TODO Windows CI: Requires a little work to get this ported.

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("run", "-d", "--name", "top", "-p", "80", "busybox:latest", "top")

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

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

 	// Not applicable on Windows to Windows CI.

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	for _, fn := range []string{"resolv.conf", "hosts"} {

 		containers := cli.DockerCmd(c, "ps", "-q", "-a").Combined()

 		if containers != "" {

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

 }

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	dockerCmd(c, "run", "-d", "--name=test", "busybox", "sh", "-c", "echo hello > /foo && top")

 	cmd := exec.Command(dockerBinary, "exec", "-it", "test", "sh")

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

 // Test the TERM env var is set when -t is provided on exec

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	out, _ := dockerCmd(c, "run", "-id", "busybox", "/bin/cat")

 	contID := strings.TrimSpace(out)

 	cmd := exec.Command(dockerBinary, "exec", "-t", contID, "sh", "-c", "if [ -z $TERM ]; then exit 1; else exit 0; fi")

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

 // Test that the TERM env var is not set on exec when -t is not provided, even if it was set

 // on run

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	out, _ := dockerCmd(c, "run", "-itd", "busybox", "/bin/cat")

 	contID := strings.TrimSpace(out)

 	cmd := exec.Command(dockerBinary, "exec", contID, "sh", "-c", "if [ -z $TERM ]; then exit 0; else exit 1; fi")

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

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))

 	s.ec = &eventCounter{}

 }

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

 // TestInfoDiscoveryBackend verifies that a daemon run with `--cluster-advertise` and

 // `--cluster-store` properly show the backend's endpoint in info output.

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	d := daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))

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

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

 // TestInfoDiscoveryInvalidAdvertise verifies that a daemon run with

 // an invalid `--cluster-advertise` configuration

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	d := daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))

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

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

 // TestInfoDiscoveryAdvertiseInterfaceName verifies that a daemon run with `--cluster-advertise`

 // configured with interface name properly show the advertise ip-address in info output.

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

-	testRequires(c, SameHostDaemon, Network, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, Network, DaemonIsLinux)

 	d := daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))

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

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

 }

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	d := daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))

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

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

 }

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	registryCIDR := "192.168.1.0/24"

 	registryHost := "insecurehost.com:5000"

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

 }

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

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	registryMirror1 := "https://192.168.1.2"

 	registryMirror2 := "http://registry.mirror.com:5000"

@@ -8,7 +8,7 @@ import (

 )

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

-	testRequires(c, SameHostDaemon, seccompEnabled, Apparmor, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, seccompEnabled, Apparmor, DaemonIsLinux)

 	out, _ := dockerCmd(c, "info")

 	c.Assert(out, checker.Contains, "Security Options:\n apparmor\n seccomp\n  Profile: default\n")

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

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

 	testRequires(c, DaemonIsLinux)

-	testRequires(c, SameHostDaemon, ExecSupport)

+	testRequires(c, testEnv.IsLocalDaemon, ExecSupport)

 	out, _ := dockerCmd(c, "run", "-itd", "--name", "one", "busybox", "top")

 	idOne := strings.TrimSpace(out)

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

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

 	testRequires(c, DaemonIsLinux)

-	testRequires(c, SameHostDaemon, ExecSupport)

+	testRequires(c, testEnv.IsLocalDaemon, ExecSupport)

 	dockerCmd(c, "run", "-d", "--name", "one", "busybox", "top")

 	out, _ := dockerCmd(c, "run", "-d", "--name", "two", "--link", "one:onetwo", "--link", "one:one", "busybox", "top")

 	id := strings.TrimSpace(string(out))

@@ -590,7 +590,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectDisconnect(c *check.C) {

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	// test0 bridge network

 	dockerCmd(c, "network", "create", "--subnet=192.168.0.0/16", "test1")

 	assertNwIsAvailable(c, "test1")

@@ -631,7 +631,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkIPAMMultipleNetworks(c *check.C) {

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	// Create a bridge network using custom ipam driver

 	dockerCmd(c, "network", "create", "--ipam-driver", dummyIPAMDriver, "br0")

 	assertNwIsAvailable(c, "br0")

@@ -647,7 +647,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkCustomIPAM(c *check.C) {

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	// Create a bridge network using custom ipam driver and options

 	dockerCmd(c, "network", "create", "--ipam-driver", dummyIPAMDriver, "--ipam-opt", "opt1=drv1", "--ipam-opt", "opt2=drv2", "br0")

 	assertNwIsAvailable(c, "br0")

@@ -660,7 +660,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkIPAMOptions(c *check.C) {

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	// Create a network with null ipam driver

 	_, _, err := dockerCmdWithError("network", "create", "-d", dummyNetworkDriver, "--ipam-driver", "null", "test000")

 	c.Assert(err, check.IsNil)

@@ -766,7 +766,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkIPAMInvalidCombinations(c *check.C

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	dockerCmd(c, "network", "create", "-d", dummyNetworkDriver, "-o", "opt1=drv1", "-o", "opt2=drv2", "testopt")

 	assertNwIsAvailable(c, "testopt")

 	gopts := remoteDriverNetworkRequest.Options[netlabel.GenericData]

@@ -950,7 +950,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkLinkOnDefaultNetworkOnly(c *check.

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	// Verify exposed ports are present in ps output when running a container on

 	// a network managed by a driver which does not provide the default gateway

 	// for the container

@@ -977,7 +977,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkOverlayPortMapping(c *check.C) {

 }

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

-	testRequires(c, DaemonIsLinux, NotUserNamespace, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, NotUserNamespace, testEnv.IsLocalDaemon)

 	dnd := "dnd"

 	did := "did"

@@ -1018,7 +1018,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkDriverUngracefulRestart(c *check.C

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	// Verify endpoint MAC address is correctly populated in container's network settings

 	nwn := "ov"

 	ctn := "bb"

@@ -1084,7 +1084,7 @@ func verifyContainerIsConnectedToNetworks(c *check.C, d *daemon.Daemon, cName st

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	cName := "bb"

 	nwList := []string{"nw1", "nw2", "nw3"}

@@ -1103,7 +1103,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksGracefulDaemonRest

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	cName := "cc"

 	nwList := []string{"nw1", "nw2", "nw3"}

@@ -1130,7 +1130,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkRunNetByID(c *check.C) {

 }

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

-	testRequires(c, DaemonIsLinux, NotUserNamespace, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, NotUserNamespace, testEnv.IsLocalDaemon)

 	s.d.StartWithBusybox(c)

 	// Run a few containers on host network

@@ -1256,7 +1256,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkRestartWithMultipleNetworks(c *che

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	dockerCmd(c, "network", "create", "test")

 	dockerCmd(c, "create", "--name=foo", "busybox", "top")

 	dockerCmd(c, "network", "connect", "test", "foo")

@@ -1785,7 +1785,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkDisconnectFromBridge(c *check.C) {

 // TestConntrackFlowsLeak covers the failure scenario of ticket: https://github.com/docker/docker/issues/8795

 // Validates that conntrack is correctly cleaned once a container is destroyed

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

-	testRequires(c, IsAmd64, DaemonIsLinux, Network, SameHostDaemon)

+	testRequires(c, IsAmd64, DaemonIsLinux, Network, testEnv.IsLocalDaemon)

 	// Create a new network

 	cli.DockerCmd(c, "network", "create", "--subnet=192.168.10.0/24", "--gateway=192.168.10.1", "-o", "com.docker.network.bridge.host_binding_ipv4=192.168.10.1", "testbind")

@@ -440,7 +440,7 @@ enabled: false`, id, name)

 }

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

-	testRequires(c, DaemonIsLinux, Network, SameHostDaemon, IsAmd64, NotUserNamespace)

+	testRequires(c, DaemonIsLinux, Network, testEnv.IsLocalDaemon, IsAmd64, NotUserNamespace)

 	plugin := "cpuguy83/docker-volume-driver-plugin-local:latest"

 	pluginV2 := "cpuguy83/docker-volume-driver-plugin-local:v2"

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

 }

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

-	testRequires(c, DaemonIsLinux, Network, SameHostDaemon, IsAmd64)

+	testRequires(c, DaemonIsLinux, Network, testEnv.IsLocalDaemon, IsAmd64)

 	d := daemon.New(c, dockerBinary, dockerdBinary)

 	d.Start(c)

 	defer d.Stop(c)

@@ -10,7 +10,7 @@ import (

 )

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)

 	icmd.RunCmd(icmd.Cmd{

 		Command: []string{dockerBinary, "info"},

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

 // Can't use localhost here since go has a special case to not use proxy if connecting to localhost

 // See https://golang.org/pkg/net/http/#ProxyFromEnvironment

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	// get the IP to use to connect since we can't use localhost

 	addrs, err := net.InterfaceAddrs()

 	c.Assert(err, checker.IsNil)

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

 }

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

-	testRequires(c, DaemonIsLinux, SameHostDaemon, NotUserNamespace, NotArm)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon, NotUserNamespace, NotArm)

 	// Run a container on the default bridge network

 	out, _ := dockerCmd(c, "run", "-d", "--name", "c0", "busybox", "top")

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

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	out := runSleepingContainer(c, "-d", "--restart=always")

 	id := strings.TrimSpace(out)

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

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

 	// TODO Windows. This may be portable following HNS integration post TP5.

-	testRequires(c, DaemonIsLinux, SameHostDaemon, NotUserNamespace, NotArm)

+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon, NotUserNamespace, NotArm)

 	dockerCmd(c, "network", "create", "-d", "bridge", "udNet")

 	dockerCmd(c, "run", "-d", "--net=udNet", "--name=first", "busybox", "top")

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

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	out := runSleepingContainer(c, "-d", "--restart=always")

 	id := strings.TrimSpace(out)

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

 	)

 	// This test cannot run on a Windows daemon as

 	// Windows does not support symlinks inside a volume path

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	name := "test-volume-symlink"

 	dir, err := ioutil.TempDir("", name)

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

 	)

 	// This test cannot run on a Windows daemon as

 	// Windows does not support symlinks inside a volume path

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)

 	name := "test-volume-symlink2"

 	if testEnv.OSType == "windows" {

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

 }

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

-	testRequires(c, SameHostDaemon)

+	testRequires(c, testEnv.IsLocalDaemon)

 	prefix, slash := getPrefixAndSlashFromDaemonPlatform()

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

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

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

 	someplace := ":/someplace"

 	if testEnv.OSType == "windows" {

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

-		testRequires(c, SameHostDaemon)

+		testRequires(c, testEnv.IsLocalDaemon)

 		someplace = `:c:\someplace`

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

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

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

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

 	// Not applicable on Windows as Windows does not support -h

-	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)

+	testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux, NotUserNamespace)

 	out, _ := dockerCmd(c, "run", "-h=testhostname", "busybox", "cat", "/etc/hostname")

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

 // Verify that a container gets default DNS when only localhost resolvers exist

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

 	// Not applicable on Windows as this is testing Unix specific functionality

-	testRequires(c, SameHostDaemon, DaemonIsLinux)