diff --git a/checkpoint_test.go b/checkpoint_test.go
index 135ec26a1..7afcbb679 100644
--- a/checkpoint_test.go
+++ b/checkpoint_test.go
@@ -20,7 +20,7 @@ func TestCheckpointRestore(t *testing.T) {
 
 	var (
 		ctx, cancel = testContext()
-		id          = "CheckpointRestore"
+		id          = t.Name()
 	)
 	defer cancel()
 
@@ -113,7 +113,7 @@ func TestCheckpointRestoreNewContainer(t *testing.T) {
 	}
 	defer client.Close()
 
-	const id = "CheckpointRestoreNewContainer"
+	id := t.Name()
 	ctx, cancel := testContext()
 	defer cancel()
 
diff --git a/container_test.go b/container_test.go
index 3a85255f0..9c5a8b8a1 100644
--- a/container_test.go
+++ b/container_test.go
@@ -43,7 +43,7 @@ func TestNewContainer(t *testing.T) {
 	if testing.Short() {
 		t.Skip()
 	}
-	id := "NewContainer"
+	id := t.Name()
 	client, err := New(address)
 	if err != nil {
 		t.Fatal(err)
@@ -90,7 +90,7 @@ func TestContainerStart(t *testing.T) {
 
 	var (
 		ctx, cancel = testContext()
-		id          = "ContainerStart"
+		id          = t.Name()
 	)
 	defer cancel()
 
@@ -160,7 +160,7 @@ func TestContainerOutput(t *testing.T) {
 
 	var (
 		ctx, cancel = testContext()
-		id          = "ContainerOutput"
+		id          = t.Name()
 		expected    = "kingkoye"
 	)
 	defer cancel()
@@ -233,7 +233,7 @@ func TestContainerExec(t *testing.T) {
 
 	var (
 		ctx, cancel = testContext()
-		id          = "ContainerExec"
+		id          = t.Name()
 	)
 	defer cancel()
 
@@ -320,7 +320,7 @@ func TestContainerProcesses(t *testing.T) {
 
 	var (
 		ctx, cancel = testContext()
-		id          = "ContainerProcesses"
+		id          = t.Name()
 	)
 	defer cancel()
 
@@ -393,7 +393,7 @@ func TestContainerCloseStdin(t *testing.T) {
 
 	var (
 		ctx, cancel = testContext()
-		id          = "ContainerCloseStdin"
+		id          = t.Name()
 	)
 	defer cancel()
 
@@ -477,7 +477,7 @@ func TestContainerAttach(t *testing.T) {
 
 	var (
 		ctx, cancel = testContext()
-		id          = "ContainerAttach"
+		id          = t.Name()
 	)
 	defer cancel()