diff --git a/integration-cli/docker_cli_restart_test.go b/integration-cli/docker_cli_restart_test.go
new file mode 100644
index 0000000000..c62f108cc7
--- /dev/null
+++ b/integration-cli/docker_cli_restart_test.go
@@ -0,0 +1,122 @@
+package main
+
+import (
+	"os/exec"
+	"strings"
+	"testing"
+)
+
+func TestDockerRestartStoppedContainer(t *testing.T) {
+	runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "echo", "foobar")
+	out, _, err := runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	cleanedContainerID := stripTrailingCharacters(out)
+
+	runCmd = exec.Command(dockerBinary, "wait", cleanedContainerID)
+	out, _, err = runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	runCmd = exec.Command(dockerBinary, "logs", cleanedContainerID)
+	out, _, err = runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	if out != "foobar\n" {
+		t.Errorf("container should've printed 'foobar'")
+	}
+
+	runCmd = exec.Command(dockerBinary, "restart", cleanedContainerID)
+	out, _, err = runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	runCmd = exec.Command(dockerBinary, "logs", cleanedContainerID)
+	out, _, err = runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	if out != "foobar\nfoobar\n" {
+		t.Errorf("container should've printed 'foobar' twice")
+	}
+
+	deleteAllContainers()
+
+	logDone("restart - echo foobar for stopped container")
+}
+
+func TestDockerRestartRunningContainer(t *testing.T) {
+	runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "sh", "-c", "echo foobar && sleep 30 && echo 'should not print this'")
+	out, _, err := runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	cleanedContainerID := stripTrailingCharacters(out)
+
+	runCmd = exec.Command(dockerBinary, "logs", cleanedContainerID)
+	out, _, err = runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	if out != "foobar\n" {
+		t.Errorf("container should've printed 'foobar'")
+	}
+
+	runCmd = exec.Command(dockerBinary, "restart", "-t", "1", cleanedContainerID)
+	out, _, err = runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	runCmd = exec.Command(dockerBinary, "logs", cleanedContainerID)
+	out, _, err = runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	if out != "foobar\nfoobar\n" {
+		t.Errorf("container should've printed 'foobar' twice")
+	}
+
+	deleteAllContainers()
+
+	logDone("restart - echo foobar for running container")
+}
+
+// Test that restarting a container with a volume does not create a new volume on restart. Regression test for #819.
+func TestDockerRestartWithVolumes(t *testing.T) {
+	runCmd := exec.Command(dockerBinary, "run", "-d", "-v", "/test", "busybox", "top")
+	out, _, err := runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	cleanedContainerID := stripTrailingCharacters(out)
+
+	runCmd = exec.Command(dockerBinary, "inspect", "--format", "{{ len .Volumes }}", cleanedContainerID)
+	out, _, err = runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	if out = strings.Trim(out, " \n\r"); out != "1" {
+		t.Errorf("expect 1 volume received %s", out)
+	}
+
+	runCmd = exec.Command(dockerBinary, "inspect", "--format", "{{ .Volumes }}", cleanedContainerID)
+	volumes, _, err := runCommandWithOutput(runCmd)
+	errorOut(err, t, volumes)
+
+	runCmd = exec.Command(dockerBinary, "restart", cleanedContainerID)
+	out, _, err = runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	runCmd = exec.Command(dockerBinary, "inspect", "--format", "{{ len .Volumes }}", cleanedContainerID)
+	out, _, err = runCommandWithOutput(runCmd)
+	errorOut(err, t, out)
+
+	if out = strings.Trim(out, " \n\r"); out != "1" {
+		t.Errorf("expect 1 volume after restart received %s", out)
+	}
+
+	runCmd = exec.Command(dockerBinary, "inspect", "--format", "{{ .Volumes }}", cleanedContainerID)
+	volumesAfterRestart, _, err := runCommandWithOutput(runCmd)
+	errorOut(err, t, volumesAfterRestart)
+
+	if volumes != volumesAfterRestart {
+		volumes = strings.Trim(volumes, " \n\r")
+		volumesAfterRestart = strings.Trim(volumesAfterRestart, " \n\r")
+		t.Errorf("expected volume path: %s Actual path: %s", volumes, volumesAfterRestart)
+	}
+
+	deleteAllContainers()
+
+	logDone("restart - does not create a new volume on restart")
+}
diff --git a/integration/container_test.go b/integration/container_test.go
index 48b3321a50..e70da5f14d 100644
--- a/integration/container_test.go
+++ b/integration/container_test.go
@@ -71,37 +71,6 @@ func TestKillDifferentUser(t *testing.T) {
 	}
 }
 
-func TestRestart(t *testing.T) {
-	daemon := mkDaemon(t)
-	defer nuke(daemon)
-	container, _, err := daemon.Create(&runconfig.Config{
-		Image: GetTestImage(daemon).ID,
-		Cmd:   []string{"echo", "-n", "foobar"},
-	},
-		"",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer daemon.Destroy(container)
-	output, err := container.Output()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(output) != "foobar" {
-		t.Error(string(output))
-	}
-
-	// Run the container again and check the output
-	output, err = container.Output()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(output) != "foobar" {
-		t.Error(string(output))
-	}
-}
-
 func TestRestartStdin(t *testing.T) {
 	daemon := mkDaemon(t)
 	defer nuke(daemon)
@@ -526,47 +495,3 @@ func TestBindMounts(t *testing.T) {
 		t.Fatal("Container failed to write to bind mount file")
 	}
 }
-
-// Test that restarting a container with a volume does not create a new volume on restart. Regression test for #819.
-func TestRestartWithVolumes(t *testing.T) {
-	daemon := mkDaemon(t)
-	defer nuke(daemon)
-
-	container, _, err := daemon.Create(&runconfig.Config{
-		Image:   GetTestImage(daemon).ID,
-		Cmd:     []string{"echo", "-n", "foobar"},
-		Volumes: map[string]struct{}{"/test": {}},
-	},
-		"",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer daemon.Destroy(container)
-
-	for key := range container.Config.Volumes {
-		if key != "/test" {
-			t.Fail()
-		}
-	}
-
-	_, err = container.Output()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := container.Volumes["/test"]
-	if expected == "" {
-		t.Fail()
-	}
-	// Run the container again to verify the volume path persists
-	_, err = container.Output()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	actual := container.Volumes["/test"]
-	if expected != actual {
-		t.Fatalf("Expected volume path: %s Actual path: %s", expected, actual)
-	}
-}