diff --git a/api_test.go b/api_test.go
index b2fd252ff6..1d9963d8dc 100644
--- a/api_test.go
+++ b/api_test.go
@@ -230,23 +230,7 @@ func TestInfo(t *testing.T) {
 // 	}
 // }
 
-// func TestCreateListStartStopRestartKillWaitDelete(t *testing.T) {
-// 	containers := testListContainers(t, -1)
-// 	for _, container := range containers {
-// 		testDeleteContainer(t, container.Id)
-// 	}
-// 	testCreateContainer(t)
-// 	id := testListContainers(t, 1)[0].Id
-// 	testContainerStart(t, id)
-// 	testContainerStop(t, id)
-// 	testContainerRestart(t, id)
-// 	testContainerKill(t, id)
-// 	testContainerWait(t, id)
-// 	testDeleteContainer(t, id)
-// 	testListContainers(t, 0)
-// }
-
-func testCreateContainer(t *testing.T) {
+func TestCreateListStartStopRestartKillWaitDelete(t *testing.T) {
 
 	runtime, err := newTestRuntime()
 	if err != nil {
@@ -256,6 +240,23 @@ func testCreateContainer(t *testing.T) {
 
 	srv := &Server{runtime: runtime}
 
+	containers := testListContainers(t, srv, -1)
+	for _, container := range containers {
+		testDeleteContainer(t, srv, container.Id)
+	}
+	testCreateContainer(t, srv)
+	id := testListContainers(t, srv, 1)[0].Id
+	testContainerStart(t, srv, id)
+	testContainerStop(t, srv, id)
+	testContainerRestart(t, srv, id)
+	testContainerKill(t, srv, id)
+	testContainerWait(t, srv, id)
+	testDeleteContainer(t, srv, id)
+	testListContainers(t, srv, 0)
+}
+
+func testCreateContainer(t *testing.T, srv *Server) {
+
 	r := httptest.NewRecorder()
 
 	config, _, err := ParseRun([]string{unitTestImageName, "touch test"}, nil)