@@ -44,7 +44,7 @@ import (

 	"gotest.tools/icmd"

 )

-const containerdSocket = "/run/containerd/containerd.sock" // "/var/run/docker/containerd/docker-containerd.sock"

+const containerdSocket = "/var/run/docker/containerd/containerd.sock"

 // TestLegacyDaemonCommand test starting docker daemon using "deprecated" docker daemon

 // command. Remove this test when we remove this.

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

 {

     "runtimes": {

         "oci": {

-            "path": "docker-runc"

+            "path": "runc"

         },

         "vm": {

             "path": "/usr/local/bin/vm-manager",

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

     "default-runtime": "vm",

     "runtimes": {

         "oci": {

-            "path": "docker-runc"

+            "path": "runc"

         },

         "vm": {

             "path": "/usr/local/bin/vm-manager",

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

 }

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

-	s.d.StartWithBusybox(c, "--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager")

+	s.d.StartWithBusybox(c, "--add-runtime", "oci=runc", "--add-runtime", "vm=/usr/local/bin/vm-manager")

 	// Run with default runtime

 	out, err := s.d.Cmd("run", "--rm", "busybox", "ls")

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

 	// Check that we can select a default runtime

 	s.d.Stop(c)

-	s.d.StartWithBusybox(c, "--default-runtime=vm", "--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager")

+	s.d.StartWithBusybox(c, "--default-runtime=vm", "--add-runtime", "oci=runc", "--add-runtime", "vm=/usr/local/bin/vm-manager")

 	out, err = s.d.Cmd("run", "--rm", "busybox", "ls")

 	c.Assert(err, check.NotNil, check.Commentf("%s", out))

@@ -38,6 +38,7 @@ type logT interface {

 }

 const defaultDockerdBinary = "dockerd"

+const containerdSocket = "/var/run/docker/containerd/containerd.sock"

 var errDaemonNotStarted = errors.New("daemon not started")

@@ -224,6 +225,7 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error {

 		return errors.Wrapf(err, "[%s] could not find docker binary in $PATH", d.id)

 	}

 	args := append(d.GlobalFlags,

+		"--containerd", containerdSocket,

 		"--data-root", d.Root,

 		"--exec-root", d.execRoot,

 		"--pidfile", fmt.Sprintf("%s/docker.pid", d.Folder),