diff --git a/client/image_import_test.go b/client/image_import_test.go
index e5e935921c..4227a8f600 100644
--- a/client/image_import_test.go
+++ b/client/image_import_test.go
@@ -78,7 +78,9 @@ func TestImageImport(t *testing.T) {
 				SourceName: "image_source",
 			}, "repository_name:imported", tc.options)
 			assert.NilError(t, err)
-			defer assert.NilError(t, result.Close())
+			defer func() {
+				assert.NilError(t, result.Close())
+			}()
 
 			body, err := io.ReadAll(result)
 			assert.NilError(t, err)
diff --git a/client/image_save_test.go b/client/image_save_test.go
index 7e102424bb..0f21f847fd 100644
--- a/client/image_save_test.go
+++ b/client/image_save_test.go
@@ -71,7 +71,9 @@ func TestImageSave(t *testing.T) {
 			assert.NilError(t, err)
 			resp, err := client.ImageSave(context.Background(), []string{"image_id1", "image_id2"}, tc.options...)
 			assert.NilError(t, err)
-			defer assert.NilError(t, resp.Close())
+			defer func() {
+				assert.NilError(t, resp.Close())
+			}()
 
 			body, err := io.ReadAll(resp)
 			assert.NilError(t, err)
diff --git a/daemon/logger/loggertest/logreader.go b/daemon/logger/loggertest/logreader.go
index b3ebfd71b3..e0d6d4020b 100644
--- a/daemon/logger/loggertest/logreader.go
+++ b/daemon/logger/loggertest/logreader.go
@@ -292,7 +292,9 @@ func (tr Reader) TestFollow(t *testing.T) {
 		}()
 
 		expected := logMessages(t, l, mm)[:2]
-		defer assert.NilError(t, l.Close()) // Reading should end before the logger is closed.
+		defer func() {
+			assert.NilError(t, l.Close()) // Reading should end before the logger is closed.
+		}()
 		<-doneReading
 		assert.DeepEqual(t, logs, expected, compareLog)
 	})
@@ -317,7 +319,9 @@ func (tr Reader) TestFollow(t *testing.T) {
 		}()
 
 		expected := logMessages(t, l, mm)[1:2]
-		defer assert.NilError(t, l.Close()) // Reading should end before the logger is closed.
+		defer func() {
+			assert.NilError(t, l.Close()) // Reading should end before the logger is closed.
+		}()
 		<-doneReading
 		assert.DeepEqual(t, logs, expected, compareLog)
 	})
diff --git a/daemon/volume/local/local_linux_test.go b/daemon/volume/local/local_linux_test.go
index da082801a8..599ac78283 100644
--- a/daemon/volume/local/local_linux_test.go
+++ b/daemon/volume/local/local_linux_test.go
@@ -235,13 +235,15 @@ func TestVolCreateValidation(t *testing.T) {
 			}
 			v, err := r.Create(tc.name, tc.opts)
 			if v != nil {
-				defer assert.Check(t, r.Remove(v))
+				defer func() {
+					assert.Check(t, r.Remove(v))
+				}()
 			}
 			if tc.expectedErr == "" {
 				assert.NilError(t, err)
 			} else {
 				assert.Check(t, cerrdefs.IsInvalidArgument(err), "got: %T", err)
-				assert.ErrorContains(t, err, tc.expectedErr)
+				assert.Check(t, is.ErrorContains(err, tc.expectedErr))
 			}
 		})
 	}
diff --git a/integration/networking/port_mapping_linux_test.go b/integration/networking/port_mapping_linux_test.go
index a144567d27..e2bf9fb9b8 100644
--- a/integration/networking/port_mapping_linux_test.go
+++ b/integration/networking/port_mapping_linux_test.go
@@ -322,7 +322,9 @@ func TestAccessPublishedPortFromHost(t *testing.T) {
 	revertIPv6OnAll := enableIPv6OnAll(t)
 	defer revertIPv6OnAll()
 	assert.NilError(t, exec.Command("ip", "addr", "add", "fdfb:5cbb:29bf::2/64", "dev", "eth0", "nodad").Run())
-	defer assert.NilError(t, exec.Command("ip", "addr", "del", "fdfb:5cbb:29bf::2/64", "dev", "eth0").Run())
+	defer func() {
+		assert.NilError(t, exec.Command("ip", "addr", "del", "fdfb:5cbb:29bf::2/64", "dev", "eth0").Run())
+	}()
 
 	testcases := []struct {
 		ulpEnabled bool