diff --git a/client/swarm_init_test.go b/client/swarm_init_test.go
index 1c5422a82a..d00f24e251 100644
--- a/client/swarm_init_test.go
+++ b/client/swarm_init_test.go
@@ -45,10 +45,6 @@ func TestSwarmInit(t *testing.T) {
 	resp, err := client.SwarmInit(context.Background(), swarm.InitRequest{
 		ListenAddr: "0.0.0.0:2377",
 	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if resp != "body" {
-		t.Fatalf("Expected 'body', got %s", resp)
-	}
+	assert.NilError(t, err)
+	assert.Check(t, is.Equal(resp, "body"))
 }
diff --git a/client/swarm_inspect_test.go b/client/swarm_inspect_test.go
index 3d71a28f1a..eb4f700404 100644
--- a/client/swarm_inspect_test.go
+++ b/client/swarm_inspect_test.go
@@ -48,10 +48,6 @@ func TestSwarmInspect(t *testing.T) {
 	}
 
 	swarmInspect, err := client.SwarmInspect(context.Background())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if swarmInspect.ID != "swarm_id" {
-		t.Fatalf("expected `swarm_id`, got %s", swarmInspect.ID)
-	}
+	assert.NilError(t, err)
+	assert.Check(t, is.Equal(swarmInspect.ID, "swarm_id"))
 }
diff --git a/client/swarm_join_test.go b/client/swarm_join_test.go
index 18514c68a3..6e7a8cd687 100644
--- a/client/swarm_join_test.go
+++ b/client/swarm_join_test.go
@@ -45,7 +45,5 @@ func TestSwarmJoin(t *testing.T) {
 	err := client.SwarmJoin(context.Background(), swarm.JoinRequest{
 		ListenAddr: "0.0.0.0:2377",
 	})
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NilError(t, err)
 }
diff --git a/client/swarm_leave_test.go b/client/swarm_leave_test.go
index 4b8c754963..faee6097c8 100644
--- a/client/swarm_leave_test.go
+++ b/client/swarm_leave_test.go
@@ -60,8 +60,6 @@ func TestSwarmLeave(t *testing.T) {
 		}
 
 		err := client.SwarmLeave(context.Background(), leaveCase.force)
-		if err != nil {
-			t.Fatal(err)
-		}
+		assert.NilError(t, err)
 	}
 }
diff --git a/client/swarm_unlock_test.go b/client/swarm_unlock_test.go
index b1ece8a608..c4388a206d 100644
--- a/client/swarm_unlock_test.go
+++ b/client/swarm_unlock_test.go
@@ -43,7 +43,5 @@ func TestSwarmUnlock(t *testing.T) {
 	}
 
 	err := client.SwarmUnlock(context.Background(), swarm.UnlockRequest{UnlockKey: "SWMKEY-1-y6guTZNTwpQeTL5RhUfOsdBdXoQjiB2GADHSRJvbXeU"})
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NilError(t, err)
 }
diff --git a/client/swarm_update_test.go b/client/swarm_update_test.go
index b49e7f4611..c09b764aa8 100644
--- a/client/swarm_update_test.go
+++ b/client/swarm_update_test.go
@@ -43,7 +43,5 @@ func TestSwarmUpdate(t *testing.T) {
 	}
 
 	err := client.SwarmUpdate(context.Background(), swarm.Version{}, swarm.Spec{}, swarm.UpdateFlags{})
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NilError(t, err)
 }