diff --git a/client/container_commit_test.go b/client/container_commit_test.go
index 16f39b92b7..2a6902d62a 100644
--- a/client/container_commit_test.go
+++ b/client/container_commit_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"testing"
diff --git a/client/image_prune_test.go b/client/image_prune_test.go
index c15328d54a..3eba6076e6 100644
--- a/client/image_prune_test.go
+++ b/client/image_prune_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"net/http"
 	"testing"
 
diff --git a/client/network_connect_test.go b/client/network_connect_test.go
index de304d8e05..53be89ce68 100644
--- a/client/network_connect_test.go
+++ b/client/network_connect_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
diff --git a/client/network_create_test.go b/client/network_create_test.go
index 2dfd9edb8e..3ab37e30ba 100644
--- a/client/network_create_test.go
+++ b/client/network_create_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"net/http"
 	"testing"
 
diff --git a/client/network_disconnect_test.go b/client/network_disconnect_test.go
index 127355f34e..cab37df3bc 100644
--- a/client/network_disconnect_test.go
+++ b/client/network_disconnect_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
diff --git a/client/network_inspect_test.go b/client/network_inspect_test.go
index d1eb612f2d..a99e6ebeaa 100644
--- a/client/network_inspect_test.go
+++ b/client/network_inspect_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"net/http"
 	"strings"
 	"testing"
diff --git a/client/node_remove_test.go b/client/node_remove_test.go
index c64d87a296..d1dbda5181 100644
--- a/client/node_remove_test.go
+++ b/client/node_remove_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"testing"
diff --git a/client/node_update_test.go b/client/node_update_test.go
index c117b321b0..dbddbb38ac 100644
--- a/client/node_update_test.go
+++ b/client/node_update_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"net/http"
 	"testing"
 
diff --git a/client/plugin_push_test.go b/client/plugin_push_test.go
index e26c319b6a..aeb9ae4d3c 100644
--- a/client/plugin_push_test.go
+++ b/client/plugin_push_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"testing"
diff --git a/client/plugin_remove_test.go b/client/plugin_remove_test.go
index ffe8dcf352..6987d053b1 100644
--- a/client/plugin_remove_test.go
+++ b/client/plugin_remove_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"net/http"
 	"testing"
 
diff --git a/client/plugin_set_test.go b/client/plugin_set_test.go
index 945629e77c..879fff1666 100644
--- a/client/plugin_set_test.go
+++ b/client/plugin_set_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"net/http"
 	"testing"
 
diff --git a/client/secret_inspect_test.go b/client/secret_inspect_test.go
index 0af9de1710..58c7bb52cf 100644
--- a/client/secret_inspect_test.go
+++ b/client/secret_inspect_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"errors"
 	"net/http"
 	"testing"
diff --git a/client/service_inspect_test.go b/client/service_inspect_test.go
index 2769d1f7ce..0c2443cda3 100644
--- a/client/service_inspect_test.go
+++ b/client/service_inspect_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"errors"
 	"net/http"
 	"testing"
diff --git a/client/swarm_leave_test.go b/client/swarm_leave_test.go
index e294aaa9fa..5788c2ae35 100644
--- a/client/swarm_leave_test.go
+++ b/client/swarm_leave_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"testing"
diff --git a/client/task_list_test.go b/client/task_list_test.go
index 8e9aa57491..4180f98474 100644
--- a/client/task_list_test.go
+++ b/client/task_list_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"testing"