@@ -559,6 +559,7 @@ func (s *DockerSuite) TestDuplicateMountpointsForVolumesFromAndBind(c *check.C)

 	c.Assert(strings.TrimSpace(out), checker.Contains, data1)

 	c.Assert(strings.TrimSpace(out), checker.Contains, data2)

+	// /tmp/data is automatically created, because we are not using the modern mount API here

 	out, _, err := dockerCmdWithError("run", "--name=app", "--volumes-from=data1", "--volumes-from=data2", "-v", "/tmp/data:/tmp/data", "-d", "busybox", "top")

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

@@ -579,7 +580,7 @@ func (s *DockerSuite) TestDuplicateMountpointsForVolumesFromAndBind(c *check.C)

 // Test case (3) for 21845: duplicate targets for --volumes-from and `Mounts` (API only)

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

-	testRequires(c, DaemonIsLinux)

+	testRequires(c, SameHostDaemon, DaemonIsLinux)

 	image := "vimage"

 	buildImageSuccessfully(c, image, withDockerfile(`

@@ -602,6 +603,8 @@ func (s *DockerSuite) TestDuplicateMountpointsForVolumesFromAndMounts(c *check.C

 	c.Assert(strings.TrimSpace(out), checker.Contains, data1)

 	c.Assert(strings.TrimSpace(out), checker.Contains, data2)

+	err := os.MkdirAll("/tmp/data", 0755)

+	c.Assert(err, checker.IsNil)

 	// Mounts is available in API

 	status, body, err := request.SockRequest("POST", "/containers/create?name=app", map[string]interface{}{

 		"Image": "busybox",