diff --git a/integration/client/benchmark_test.go b/integration/client/benchmark_test.go
index 3cfa3c55b..d7c9f6b97 100644
--- a/integration/client/benchmark_test.go
+++ b/integration/client/benchmark_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"fmt"
diff --git a/integration/client/client_test.go b/integration/client/client_test.go
index 9f23d8e92..109ec3c7a 100644
--- a/integration/client/client_test.go
+++ b/integration/client/client_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bytes"
diff --git a/integration/client/client_ttrpc_test.go b/integration/client/client_ttrpc_test.go
index 41715d7f6..1c7aeb9da 100644
--- a/integration/client/client_ttrpc_test.go
+++ b/integration/client/client_ttrpc_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/client_unix_test.go b/integration/client/client_unix_test.go
index 670b74459..7fbf73b1e 100644
--- a/integration/client/client_unix_test.go
+++ b/integration/client/client_unix_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"testing"
diff --git a/integration/client/client_windows_test.go b/integration/client/client_windows_test.go
index 1cd50e5ea..575a06a64 100644
--- a/integration/client/client_windows_test.go
+++ b/integration/client/client_windows_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"fmt"
diff --git a/integration/client/container_checkpoint_test.go b/integration/client/container_checkpoint_test.go
index 6fe68396b..e33f4f9c8 100644
--- a/integration/client/container_checkpoint_test.go
+++ b/integration/client/container_checkpoint_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bytes"
diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go
index 626d76c52..90f1b635c 100644
--- a/integration/client/container_linux_test.go
+++ b/integration/client/container_linux_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bytes"
diff --git a/integration/client/container_test.go b/integration/client/container_test.go
index 270f6c246..143f1d1cf 100644
--- a/integration/client/container_test.go
+++ b/integration/client/container_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bytes"
diff --git a/integration/client/content_test.go b/integration/client/content_test.go
index 726aed4a5..c4aa1c03f 100644
--- a/integration/client/content_test.go
+++ b/integration/client/content_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/convert_test.go b/integration/client/convert_test.go
index 863b22b4f..8b47064b7 100644
--- a/integration/client/convert_test.go
+++ b/integration/client/convert_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"testing"
diff --git a/integration/client/daemon_config_linux_test.go b/integration/client/daemon_config_linux_test.go
index fa8ddad1a..18d425e50 100644
--- a/integration/client/daemon_config_linux_test.go
+++ b/integration/client/daemon_config_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bufio"
diff --git a/integration/client/daemon_test.go b/integration/client/daemon_test.go
index becc2bcb3..bf746c286 100644
--- a/integration/client/daemon_test.go
+++ b/integration/client/daemon_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/export_test.go b/integration/client/export_test.go
index b8fc31d88..a2c97374e 100644
--- a/integration/client/export_test.go
+++ b/integration/client/export_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"archive/tar"
diff --git a/integration/client/helpers_unix_test.go b/integration/client/helpers_unix_test.go
index 48301bd4b..f95297e8e 100644
--- a/integration/client/helpers_unix_test.go
+++ b/integration/client/helpers_unix_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/helpers_windows_test.go b/integration/client/helpers_windows_test.go
index d3ca35358..77647452f 100644
--- a/integration/client/helpers_windows_test.go
+++ b/integration/client/helpers_windows_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/image_test.go b/integration/client/image_test.go
index 1453a85ea..aeb611247 100644
--- a/integration/client/image_test.go
+++ b/integration/client/image_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/import_test.go b/integration/client/import_test.go
index c1d8d9ed9..6a1415164 100644
--- a/integration/client/import_test.go
+++ b/integration/client/import_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bytes"
diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go
index 3b0e20f70..9886f9947 100644
--- a/integration/client/lease_test.go
+++ b/integration/client/lease_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"runtime"
diff --git a/integration/client/restart_monitor_linux_test.go b/integration/client/restart_monitor_linux_test.go
index 23d939a62..aa37a1e17 100644
--- a/integration/client/restart_monitor_linux_test.go
+++ b/integration/client/restart_monitor_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/signals_test.go b/integration/client/signals_test.go
index 5f311897b..89a6c1298 100644
--- a/integration/client/signals_test.go
+++ b/integration/client/signals_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"fmt"
diff --git a/integration/client/snapshot_test.go b/integration/client/snapshot_test.go
index 463feb823..d5eed0a5e 100644
--- a/integration/client/snapshot_test.go
+++ b/integration/client/snapshot_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/task_opts_unix_test.go b/integration/client/task_opts_unix_test.go
index fbb7bd3e1..b65fb09d6 100644
--- a/integration/client/task_opts_unix_test.go
+++ b/integration/client/task_opts_unix_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"