diff --git a/client/checkpoint_create_test.go b/client/checkpoint_create_test.go
index 5703c21904..6b37034550 100644
--- a/client/checkpoint_create_test.go
+++ b/client/checkpoint_create_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestCheckpointCreateError(t *testing.T) {
@@ -25,6 +26,9 @@ func TestCheckpointCreateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestCheckpointCreate(t *testing.T) {
diff --git a/client/checkpoint_delete_test.go b/client/checkpoint_delete_test.go
index 117630d61a..3ebdd2ce02 100644
--- a/client/checkpoint_delete_test.go
+++ b/client/checkpoint_delete_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestCheckpointDeleteError(t *testing.T) {
@@ -24,6 +25,9 @@ func TestCheckpointDeleteError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestCheckpointDelete(t *testing.T) {
diff --git a/client/checkpoint_list_test.go b/client/checkpoint_list_test.go
index d5cfcda0e5..652040d4f8 100644
--- a/client/checkpoint_list_test.go
+++ b/client/checkpoint_list_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestCheckpointListError(t *testing.T) {
@@ -22,6 +23,9 @@ func TestCheckpointListError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestCheckpointList(t *testing.T) {
diff --git a/client/config_create_test.go b/client/config_create_test.go
index a6408792db..98898e0c7f 100644
--- a/client/config_create_test.go
+++ b/client/config_create_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 )
@@ -34,6 +35,9 @@ func TestConfigCreateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestConfigCreate(t *testing.T) {
diff --git a/client/config_inspect_test.go b/client/config_inspect_test.go
index 76a5dae9e5..ed247bea56 100644
--- a/client/config_inspect_test.go
+++ b/client/config_inspect_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 	"github.com/pkg/errors"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
@@ -58,6 +59,9 @@ func TestConfigInspectError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestConfigInspectConfigNotFound(t *testing.T) {
diff --git a/client/config_list_test.go b/client/config_list_test.go
index b35a592953..7b26a50ebc 100644
--- a/client/config_list_test.go
+++ b/client/config_list_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 )
@@ -36,6 +37,9 @@ func TestConfigListError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestConfigList(t *testing.T) {
diff --git a/client/config_remove_test.go b/client/config_remove_test.go
index 9c0c0f9337..3912d1bede 100644
--- a/client/config_remove_test.go
+++ b/client/config_remove_test.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/docker/docker/errdefs"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 )
@@ -32,6 +33,9 @@ func TestConfigRemoveError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestConfigRemove(t *testing.T) {
diff --git a/client/config_update_test.go b/client/config_update_test.go
index 1299f8278c..2ad5eb8f68 100644
--- a/client/config_update_test.go
+++ b/client/config_update_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 )
@@ -33,6 +34,9 @@ func TestConfigUpdateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestConfigUpdate(t *testing.T) {
diff --git a/client/container_commit_test.go b/client/container_commit_test.go
index 8e3fe8b730..dd355404aa 100644
--- a/client/container_commit_test.go
+++ b/client/container_commit_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerCommitError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestContainerCommitError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerCommit(t *testing.T) {
diff --git a/client/container_copy_test.go b/client/container_copy_test.go
index efddbef20d..a33ec5c27e 100644
--- a/client/container_copy_test.go
+++ b/client/container_copy_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerStatPathError(t *testing.T) {
@@ -22,6 +23,9 @@ func TestContainerStatPathError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerStatPathNotFoundError(t *testing.T) {
@@ -102,6 +106,9 @@ func TestCopyToContainerError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestCopyToContainerNotFoundError(t *testing.T) {
@@ -178,6 +185,9 @@ func TestCopyFromContainerError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestCopyFromContainerNotFoundError(t *testing.T) {
diff --git a/client/container_create_test.go b/client/container_create_test.go
index d46e70492d..0a3d7e722f 100644
--- a/client/container_create_test.go
+++ b/client/container_create_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerCreateError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestContainerCreateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error while testing StatusInternalServerError, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error while testing StatusInternalServerError, got %T", err)
+	}
 
 	// 404 doesn't automatically means an unknown image
 	client = &Client{
@@ -30,6 +34,9 @@ func TestContainerCreateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error while testing StatusNotFound, got %v", err)
 	}
+	if err == nil || !IsErrNotFound(err) {
+		t.Fatalf("expected a Server Error while testing StatusNotFound, got %T", err)
+	}
 }
 
 func TestContainerCreateImageNotFound(t *testing.T) {
@@ -38,7 +45,7 @@ func TestContainerCreateImageNotFound(t *testing.T) {
 	}
 	_, err := client.ContainerCreate(context.Background(), &container.Config{Image: "unknown_image"}, nil, nil, "unknown")
 	if err == nil || !IsErrNotFound(err) {
-		t.Fatalf("expected an imageNotFound error, got %v", err)
+		t.Fatalf("expected an imageNotFound error, got %v, %T", err, err)
 	}
 }
 
diff --git a/client/container_diff_test.go b/client/container_diff_test.go
index ac215f3403..310c4351b9 100644
--- a/client/container_diff_test.go
+++ b/client/container_diff_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerDiffError(t *testing.T) {
@@ -21,7 +22,9 @@ func TestContainerDiffError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
-
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerDiff(t *testing.T) {
diff --git a/client/container_exec_test.go b/client/container_exec_test.go
index 68b900bf14..c1cee4ed0f 100644
--- a/client/container_exec_test.go
+++ b/client/container_exec_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerExecCreateError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestContainerExecCreateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerExecCreate(t *testing.T) {
@@ -76,6 +80,9 @@ func TestContainerExecStartError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerExecStart(t *testing.T) {
@@ -120,6 +127,9 @@ func TestContainerExecInspectError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerExecInspect(t *testing.T) {
diff --git a/client/container_export_test.go b/client/container_export_test.go
index 8f6c8dce64..2c054a93ab 100644
--- a/client/container_export_test.go
+++ b/client/container_export_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerExportError(t *testing.T) {
@@ -18,6 +20,9 @@ func TestContainerExportError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerExport(t *testing.T) {
diff --git a/client/container_inspect_test.go b/client/container_inspect_test.go
index 92a77f6aea..fd5fc3c6d2 100644
--- a/client/container_inspect_test.go
+++ b/client/container_inspect_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 	"github.com/pkg/errors"
 )
 
@@ -23,6 +24,9 @@ func TestContainerInspectError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerInspectContainerNotFound(t *testing.T) {
diff --git a/client/container_kill_test.go b/client/container_kill_test.go
index 85bb5ee559..8d35a332bf 100644
--- a/client/container_kill_test.go
+++ b/client/container_kill_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerKillError(t *testing.T) {
@@ -18,6 +20,9 @@ func TestContainerKillError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerKill(t *testing.T) {
diff --git a/client/container_list_test.go b/client/container_list_test.go
index 809f20f5c7..6581469a55 100644
--- a/client/container_list_test.go
+++ b/client/container_list_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerListError(t *testing.T) {
@@ -22,6 +23,9 @@ func TestContainerListError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerList(t *testing.T) {
diff --git a/client/container_pause_test.go b/client/container_pause_test.go
index d1f73a67f3..33840aaea2 100644
--- a/client/container_pause_test.go
+++ b/client/container_pause_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerPauseError(t *testing.T) {
@@ -18,6 +20,9 @@ func TestContainerPauseError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerPause(t *testing.T) {
diff --git a/client/container_rename_test.go b/client/container_rename_test.go
index 42be609028..cee9a0cee5 100644
--- a/client/container_rename_test.go
+++ b/client/container_rename_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerRenameError(t *testing.T) {
@@ -18,6 +20,9 @@ func TestContainerRenameError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerRename(t *testing.T) {
diff --git a/client/container_resize_test.go b/client/container_resize_test.go
index 3c10fd7e69..c763e1ac01 100644
--- a/client/container_resize_test.go
+++ b/client/container_resize_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerResizeError(t *testing.T) {
@@ -20,6 +21,9 @@ func TestContainerResizeError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerExecResizeError(t *testing.T) {
@@ -30,6 +34,9 @@ func TestContainerExecResizeError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerResize(t *testing.T) {
diff --git a/client/container_restart_test.go b/client/container_restart_test.go
index 27e81da5d8..81cac219df 100644
--- a/client/container_restart_test.go
+++ b/client/container_restart_test.go
@@ -9,6 +9,8 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerRestartError(t *testing.T) {
@@ -20,6 +22,9 @@ func TestContainerRestartError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerRestart(t *testing.T) {
diff --git a/client/container_start_test.go b/client/container_start_test.go
index 277c585caa..8981cdce1e 100644
--- a/client/container_start_test.go
+++ b/client/container_start_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerStartError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestContainerStartError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerStart(t *testing.T) {
diff --git a/client/container_stats_test.go b/client/container_stats_test.go
index d88596315c..df10641071 100644
--- a/client/container_stats_test.go
+++ b/client/container_stats_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerStatsError(t *testing.T) {
@@ -18,6 +20,9 @@ func TestContainerStatsError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerStats(t *testing.T) {
diff --git a/client/container_stop_test.go b/client/container_stop_test.go
index e9af74525a..7d860aa575 100644
--- a/client/container_stop_test.go
+++ b/client/container_stop_test.go
@@ -9,6 +9,8 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerStopError(t *testing.T) {
@@ -20,6 +22,9 @@ func TestContainerStopError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerStop(t *testing.T) {
diff --git a/client/container_top_test.go b/client/container_top_test.go
index 48daba7783..ac0eec17b5 100644
--- a/client/container_top_test.go
+++ b/client/container_top_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerTopError(t *testing.T) {
@@ -22,6 +23,9 @@ func TestContainerTopError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerTop(t *testing.T) {
diff --git a/client/container_unpause_test.go b/client/container_unpause_test.go
index 000699190a..7817b50b1e 100644
--- a/client/container_unpause_test.go
+++ b/client/container_unpause_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerUnpauseError(t *testing.T) {
@@ -18,6 +20,9 @@ func TestContainerUnpauseError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerUnpause(t *testing.T) {
diff --git a/client/container_update_test.go b/client/container_update_test.go
index 41c6485ec8..8e47e489c0 100644
--- a/client/container_update_test.go
+++ b/client/container_update_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerUpdateError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestContainerUpdateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestContainerUpdate(t *testing.T) {
diff --git a/client/container_wait_test.go b/client/container_wait_test.go
index 9236f6f406..320567f12d 100644
--- a/client/container_wait_test.go
+++ b/client/container_wait_test.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestContainerWaitError(t *testing.T) {
@@ -27,6 +28,9 @@ func TestContainerWaitError(t *testing.T) {
 		if err.Error() != "Error response from daemon: Server error" {
 			t.Fatalf("expected a Server Error, got %v", err)
 		}
+		if !errdefs.IsSystem(err) {
+			t.Fatalf("expected a Server Error, got %T", err)
+		}
 	}
 }
 
diff --git a/client/disk_usage_test.go b/client/disk_usage_test.go
index 3968f75e62..824c689f02 100644
--- a/client/disk_usage_test.go
+++ b/client/disk_usage_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestDiskUsageError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestDiskUsageError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestDiskUsage(t *testing.T) {
diff --git a/client/events_test.go b/client/events_test.go
index 4a39901b45..50a885c069 100644
--- a/client/events_test.go
+++ b/client/events_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestEventsErrorInOptions(t *testing.T) {
@@ -55,6 +56,9 @@ func TestEventsErrorFromServer(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestEvents(t *testing.T) {
diff --git a/client/image_build_test.go b/client/image_build_test.go
index 95c11bc3e5..6cc14145ac 100644
--- a/client/image_build_test.go
+++ b/client/image_build_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/errdefs"
 	"github.com/docker/go-units"
 )
 
@@ -23,6 +24,9 @@ func TestImageBuildError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestImageBuild(t *testing.T) {
diff --git a/client/image_create_test.go b/client/image_create_test.go
index b89f16d27b..947727d462 100644
--- a/client/image_create_test.go
+++ b/client/image_create_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestImageCreateError(t *testing.T) {
@@ -20,6 +21,9 @@ func TestImageCreateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestImageCreate(t *testing.T) {
diff --git a/client/image_history_test.go b/client/image_history_test.go
index 0217bf575a..ee0e3a35b2 100644
--- a/client/image_history_test.go
+++ b/client/image_history_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/image"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestImageHistoryError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestImageHistoryError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestImageHistory(t *testing.T) {
diff --git a/client/image_import_test.go b/client/image_import_test.go
index 944cd52fec..b3a7d4dea3 100644
--- a/client/image_import_test.go
+++ b/client/image_import_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestImageImportError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestImageImportError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestImageImport(t *testing.T) {
diff --git a/client/image_inspect_test.go b/client/image_inspect_test.go
index a910872d1c..f72fae2a0e 100644
--- a/client/image_inspect_test.go
+++ b/client/image_inspect_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 	"github.com/pkg/errors"
 )
 
@@ -24,6 +25,9 @@ func TestImageInspectError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestImageInspectImageNotFound(t *testing.T) {
diff --git a/client/image_list_test.go b/client/image_list_test.go
index 3ba5239a53..418213f70d 100644
--- a/client/image_list_test.go
+++ b/client/image_list_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestImageListError(t *testing.T) {
@@ -23,6 +24,9 @@ func TestImageListError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestImageList(t *testing.T) {
diff --git a/client/image_load_test.go b/client/image_load_test.go
index 116317da75..22fb1afb82 100644
--- a/client/image_load_test.go
+++ b/client/image_load_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestImageLoadError(t *testing.T) {
@@ -19,6 +21,9 @@ func TestImageLoadError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestImageLoad(t *testing.T) {
diff --git a/client/image_pull_test.go b/client/image_pull_test.go
index 361c5c2be3..0f98a4a128 100644
--- a/client/image_pull_test.go
+++ b/client/image_pull_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestImagePullReferenceParseError(t *testing.T) {
@@ -33,6 +34,9 @@ func TestImagePullAnyError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestImagePullStatusUnauthorizedError(t *testing.T) {
diff --git a/client/image_push_test.go b/client/image_push_test.go
index 0693601af1..48429ef5c9 100644
--- a/client/image_push_test.go
+++ b/client/image_push_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestImagePushReferenceError(t *testing.T) {
@@ -38,6 +39,9 @@ func TestImagePushAnyError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestImagePushStatusUnauthorizedError(t *testing.T) {
diff --git a/client/image_save_test.go b/client/image_save_test.go
index a40055e583..128a040168 100644
--- a/client/image_save_test.go
+++ b/client/image_save_test.go
@@ -9,6 +9,8 @@ import (
 	"reflect"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestImageSaveError(t *testing.T) {
@@ -19,6 +21,9 @@ func TestImageSaveError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestImageSave(t *testing.T) {
diff --git a/client/image_search_test.go b/client/image_search_test.go
index 1456cd606f..184fe024e8 100644
--- a/client/image_search_test.go
+++ b/client/image_search_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/registry"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestImageSearchAnyError(t *testing.T) {
@@ -23,6 +24,9 @@ func TestImageSearchAnyError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestImageSearchStatusUnauthorizedError(t *testing.T) {
diff --git a/client/image_tag_test.go b/client/image_tag_test.go
index 2923bb995b..0298495101 100644
--- a/client/image_tag_test.go
+++ b/client/image_tag_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestImageTagError(t *testing.T) {
@@ -19,6 +21,9 @@ func TestImageTagError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 // Note: this is not testing all the InvalidReference as it's the responsibility
diff --git a/client/info_test.go b/client/info_test.go
index 866d8e8849..7bde0f316b 100644
--- a/client/info_test.go
+++ b/client/info_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestInfoServerError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestInfoServerError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestInfoInvalidResponseJSONError(t *testing.T) {
diff --git a/client/network_connect_test.go b/client/network_connect_test.go
index 07a3ba692e..ef509b7929 100644
--- a/client/network_connect_test.go
+++ b/client/network_connect_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/network"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestNetworkConnectError(t *testing.T) {
@@ -23,6 +24,9 @@ func TestNetworkConnectError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestNetworkConnectEmptyNilEndpointSettings(t *testing.T) {
diff --git a/client/network_create_test.go b/client/network_create_test.go
index 894c98ebb3..313f53f907 100644
--- a/client/network_create_test.go
+++ b/client/network_create_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestNetworkCreateError(t *testing.T) {
@@ -22,6 +23,9 @@ func TestNetworkCreateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestNetworkCreate(t *testing.T) {
diff --git a/client/network_disconnect_test.go b/client/network_disconnect_test.go
index b27b955e2e..7ec85f9387 100644
--- a/client/network_disconnect_test.go
+++ b/client/network_disconnect_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestNetworkDisconnectError(t *testing.T) {
@@ -22,6 +23,9 @@ func TestNetworkDisconnectError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestNetworkDisconnect(t *testing.T) {
diff --git a/client/network_list_test.go b/client/network_list_test.go
index 5263808cfd..90ae33405d 100644
--- a/client/network_list_test.go
+++ b/client/network_list_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestNetworkListError(t *testing.T) {
@@ -25,6 +26,9 @@ func TestNetworkListError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestNetworkList(t *testing.T) {
diff --git a/client/network_prune_test.go b/client/network_prune_test.go
index 7a5d340e51..791ec1bc14 100644
--- a/client/network_prune_test.go
+++ b/client/network_prune_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/errdefs"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 )
@@ -28,6 +29,9 @@ func TestNetworksPruneError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestNetworksPrune(t *testing.T) {
diff --git a/client/network_remove_test.go b/client/network_remove_test.go
index ac40af74e6..f70c8ac16e 100644
--- a/client/network_remove_test.go
+++ b/client/network_remove_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestNetworkRemoveError(t *testing.T) {
@@ -19,6 +21,9 @@ func TestNetworkRemoveError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestNetworkRemove(t *testing.T) {
diff --git a/client/node_inspect_test.go b/client/node_inspect_test.go
index d0fdace7fe..e7164b8e41 100644
--- a/client/node_inspect_test.go
+++ b/client/node_inspect_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 	"github.com/pkg/errors"
 )
 
@@ -23,6 +24,9 @@ func TestNodeInspectError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestNodeInspectNodeNotFound(t *testing.T) {
diff --git a/client/node_list_test.go b/client/node_list_test.go
index 784a754a59..fb7b658518 100644
--- a/client/node_list_test.go
+++ b/client/node_list_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestNodeListError(t *testing.T) {
@@ -24,6 +25,9 @@ func TestNodeListError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestNodeList(t *testing.T) {
diff --git a/client/node_remove_test.go b/client/node_remove_test.go
index 85f828b849..5870ba1da3 100644
--- a/client/node_remove_test.go
+++ b/client/node_remove_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestNodeRemoveError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestNodeRemoveError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestNodeRemove(t *testing.T) {
diff --git a/client/node_update_test.go b/client/node_update_test.go
index d89e1ed858..072297d682 100644
--- a/client/node_update_test.go
+++ b/client/node_update_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestNodeUpdateError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestNodeUpdateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestNodeUpdate(t *testing.T) {
diff --git a/client/plugin_disable_test.go b/client/plugin_disable_test.go
index ac2413d6c5..2e9c0396cc 100644
--- a/client/plugin_disable_test.go
+++ b/client/plugin_disable_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestPluginDisableError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestPluginDisableError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestPluginDisable(t *testing.T) {
diff --git a/client/plugin_enable_test.go b/client/plugin_enable_test.go
index 911ccaf1e9..1c3c988d3f 100644
--- a/client/plugin_enable_test.go
+++ b/client/plugin_enable_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestPluginEnableError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestPluginEnableError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestPluginEnable(t *testing.T) {
diff --git a/client/plugin_inspect_test.go b/client/plugin_inspect_test.go
index 74ca0f0fc0..07aee67473 100644
--- a/client/plugin_inspect_test.go
+++ b/client/plugin_inspect_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 	"github.com/pkg/errors"
 )
 
@@ -23,6 +24,9 @@ func TestPluginInspectError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestPluginInspectWithEmptyID(t *testing.T) {
diff --git a/client/plugin_list_test.go b/client/plugin_list_test.go
index 7dc351dceb..521f5e6d16 100644
--- a/client/plugin_list_test.go
+++ b/client/plugin_list_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestPluginListError(t *testing.T) {
@@ -23,6 +24,9 @@ func TestPluginListError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestPluginList(t *testing.T) {
diff --git a/client/plugin_push_test.go b/client/plugin_push_test.go
index 20b23a1173..779d8f8e90 100644
--- a/client/plugin_push_test.go
+++ b/client/plugin_push_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestPluginPushError(t *testing.T) {
@@ -19,6 +21,9 @@ func TestPluginPushError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestPluginPush(t *testing.T) {
diff --git a/client/plugin_remove_test.go b/client/plugin_remove_test.go
index e6c76342ee..46d1b96fa9 100644
--- a/client/plugin_remove_test.go
+++ b/client/plugin_remove_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestPluginRemoveError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestPluginRemoveError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestPluginRemove(t *testing.T) {
diff --git a/client/plugin_set_test.go b/client/plugin_set_test.go
index 2e97904b86..eee467c26b 100644
--- a/client/plugin_set_test.go
+++ b/client/plugin_set_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestPluginSetError(t *testing.T) {
@@ -19,6 +21,9 @@ func TestPluginSetError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestPluginSet(t *testing.T) {
diff --git a/client/request_test.go b/client/request_test.go
index 2847a9a4a3..de563d2c50 100644
--- a/client/request_test.go
+++ b/client/request_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/errdefs"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 )
@@ -88,6 +89,9 @@ func TestPlainTextError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestInfiniteError(t *testing.T) {
diff --git a/client/secret_create_test.go b/client/secret_create_test.go
index 419bdbcbc6..23c2449b55 100644
--- a/client/secret_create_test.go
+++ b/client/secret_create_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 )
@@ -34,6 +35,9 @@ func TestSecretCreateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestSecretCreate(t *testing.T) {
diff --git a/client/secret_inspect_test.go b/client/secret_inspect_test.go
index 6c84799b17..bc5ae38859 100644
--- a/client/secret_inspect_test.go
+++ b/client/secret_inspect_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 	"github.com/pkg/errors"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
@@ -35,6 +36,9 @@ func TestSecretInspectError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestSecretInspectSecretNotFound(t *testing.T) {
diff --git a/client/secret_list_test.go b/client/secret_list_test.go
index 72323b055f..0460ceb850 100644
--- a/client/secret_list_test.go
+++ b/client/secret_list_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 )
@@ -36,6 +37,9 @@ func TestSecretListError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestSecretList(t *testing.T) {
diff --git a/client/secret_remove_test.go b/client/secret_remove_test.go
index bdfccf6be8..c69db4096d 100644
--- a/client/secret_remove_test.go
+++ b/client/secret_remove_test.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/docker/docker/errdefs"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 )
@@ -32,6 +33,9 @@ func TestSecretRemoveError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestSecretRemove(t *testing.T) {
diff --git a/client/secret_update_test.go b/client/secret_update_test.go
index c7670b440c..c52ae2b8b8 100644
--- a/client/secret_update_test.go
+++ b/client/secret_update_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 )
@@ -33,6 +34,9 @@ func TestSecretUpdateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestSecretUpdate(t *testing.T) {
diff --git a/client/service_create_test.go b/client/service_create_test.go
index 9f51c18223..df836ae2af 100644
--- a/client/service_create_test.go
+++ b/client/service_create_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/docker/docker/api/types"
 	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 	"github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/specs-go/v1"
 	"gotest.tools/assert"
@@ -27,6 +28,9 @@ func TestServiceCreateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestServiceCreate(t *testing.T) {
diff --git a/client/service_inspect_test.go b/client/service_inspect_test.go
index b69332ccc6..dbf0371e37 100644
--- a/client/service_inspect_test.go
+++ b/client/service_inspect_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 	"github.com/pkg/errors"
 )
 
@@ -24,6 +25,9 @@ func TestServiceInspectError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestServiceInspectServiceNotFound(t *testing.T) {
diff --git a/client/service_list_test.go b/client/service_list_test.go
index 9903f9e71c..da239999a8 100644
--- a/client/service_list_test.go
+++ b/client/service_list_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestServiceListError(t *testing.T) {
@@ -24,6 +25,9 @@ func TestServiceListError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestServiceList(t *testing.T) {
diff --git a/client/service_update_test.go b/client/service_update_test.go
index 9a0a9ce0dd..9b5d1616f0 100644
--- a/client/service_update_test.go
+++ b/client/service_update_test.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestServiceUpdateError(t *testing.T) {
@@ -22,6 +23,9 @@ func TestServiceUpdateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestServiceUpdate(t *testing.T) {
diff --git a/client/swarm_init_test.go b/client/swarm_init_test.go
index 1abadc75e9..78b8245461 100644
--- a/client/swarm_init_test.go
+++ b/client/swarm_init_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestSwarmInitError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestSwarmInitError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestSwarmInit(t *testing.T) {
diff --git a/client/swarm_inspect_test.go b/client/swarm_inspect_test.go
index 954adc94c6..46996ee10c 100644
--- a/client/swarm_inspect_test.go
+++ b/client/swarm_inspect_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestSwarmInspectError(t *testing.T) {
@@ -22,6 +23,9 @@ func TestSwarmInspectError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestSwarmInspect(t *testing.T) {
diff --git a/client/swarm_join_test.go b/client/swarm_join_test.go
index e67f2bdecf..215483830b 100644
--- a/client/swarm_join_test.go
+++ b/client/swarm_join_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestSwarmJoinError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestSwarmJoinError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestSwarmJoin(t *testing.T) {
diff --git a/client/swarm_leave_test.go b/client/swarm_leave_test.go
index 3dd3711d04..b5484b3382 100644
--- a/client/swarm_leave_test.go
+++ b/client/swarm_leave_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestSwarmLeaveError(t *testing.T) {
@@ -19,6 +21,9 @@ func TestSwarmLeaveError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestSwarmLeave(t *testing.T) {
diff --git a/client/swarm_unlock_test.go b/client/swarm_unlock_test.go
index b3bcc5d922..dbcc870e2d 100644
--- a/client/swarm_unlock_test.go
+++ b/client/swarm_unlock_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestSwarmUnlockError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestSwarmUnlockError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestSwarmUnlock(t *testing.T) {
diff --git a/client/swarm_update_test.go b/client/swarm_update_test.go
index e908bf7860..3acad9da8a 100644
--- a/client/swarm_update_test.go
+++ b/client/swarm_update_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestSwarmUpdateError(t *testing.T) {
@@ -21,6 +22,9 @@ func TestSwarmUpdateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestSwarmUpdate(t *testing.T) {
diff --git a/client/task_inspect_test.go b/client/task_inspect_test.go
index fe5c5bd778..04da8883dd 100644
--- a/client/task_inspect_test.go
+++ b/client/task_inspect_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 	"github.com/pkg/errors"
 )
 
@@ -23,6 +24,9 @@ func TestTaskInspectError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestTaskInspectWithEmptyID(t *testing.T) {
diff --git a/client/task_list_test.go b/client/task_list_test.go
index 16d0edaa0a..f8fc99fd34 100644
--- a/client/task_list_test.go
+++ b/client/task_list_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestTaskListError(t *testing.T) {
@@ -24,6 +25,9 @@ func TestTaskListError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestTaskList(t *testing.T) {
diff --git a/client/volume_create_test.go b/client/volume_create_test.go
index cfab191845..173fe104e1 100644
--- a/client/volume_create_test.go
+++ b/client/volume_create_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	volumetypes "github.com/docker/docker/api/types/volume"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestVolumeCreateError(t *testing.T) {
@@ -23,6 +24,9 @@ func TestVolumeCreateError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestVolumeCreate(t *testing.T) {
diff --git a/client/volume_list_test.go b/client/volume_list_test.go
index 2a83823f7e..bdba3e0846 100644
--- a/client/volume_list_test.go
+++ b/client/volume_list_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	volumetypes "github.com/docker/docker/api/types/volume"
+	"github.com/docker/docker/errdefs"
 )
 
 func TestVolumeListError(t *testing.T) {
@@ -24,6 +25,9 @@ func TestVolumeListError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestVolumeList(t *testing.T) {
diff --git a/client/volume_remove_test.go b/client/volume_remove_test.go
index 31fb3d71aa..762e046c11 100644
--- a/client/volume_remove_test.go
+++ b/client/volume_remove_test.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+
+	"github.com/docker/docker/errdefs"
 )
 
 func TestVolumeRemoveError(t *testing.T) {
@@ -19,6 +21,9 @@ func TestVolumeRemoveError(t *testing.T) {
 	if err == nil || err.Error() != "Error response from daemon: Server error" {
 		t.Fatalf("expected a Server Error, got %v", err)
 	}
+	if !errdefs.IsSystem(err) {
+		t.Fatalf("expected a Server Error, got %T", err)
+	}
 }
 
 func TestVolumeRemove(t *testing.T) {