diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2b51bd3..43bb25c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ permissions: {}
 
 env:
   ACTIONLINT_VERSION: "v1.7.9"
-  GOLANGCI_LINT_VERSION: "v2.13.0"
+  GOLANGCI_LINT_VERSION: "v2.15.0"
   JUST_VERSION: "1.53.0"
   LIBPATHRS_VERSION: "0.2.5"
   ZIZMOR_VERSION: "1.26.1"
diff --git a/.golangci.yml b/.golangci.yml
index 537a6e4..04be583 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -73,7 +73,9 @@ formatters:
     - goimports
   settings:
     gofumpt:
-      extra-rules: true
+      extra:
+        group-params: true
+        clothe-returns: true
     goimports:
       local-prefixes:
         - go.amutable.dev/quarry
diff --git a/internal/generics/iter_test.go b/internal/generics/iter_test.go
index 3dd880e..a2ae9e7 100644
--- a/internal/generics/iter_test.go
+++ b/internal/generics/iter_test.go
@@ -150,7 +150,8 @@ func TestErrorIter_EarlyTermination(t *testing.T) {
 		return nil
 	})
 
-	for range seq {
+	for _, err := range seq {
+		require.NoError(t, err)
 		break
 	}
 	assert.Equal(t, 1, produced, "producer should stop after consumer breaks")
@@ -378,7 +379,8 @@ func TestSeqRight_EarlyTermination(t *testing.T) {
 	), &yielded)
 
 	var count int
-	for range generics.SeqRight(src) {
+	for err := range generics.SeqRight(src) {
+		require.NoError(t, err)
 		count++
 		if count == 3 {
 			break
diff --git a/internal/hostnamed/hostnamedtest/real.go b/internal/hostnamed/hostnamedtest/real.go
index 3fa50ea..791cea4 100644
--- a/internal/hostnamed/hostnamedtest/real.go
+++ b/internal/hostnamed/hostnamedtest/real.go
@@ -333,11 +333,15 @@ func (h *Hostnamed) Stop(t *testing.T) {
 		return
 	}
 	_ = h.cmd.Process.Signal(syscall.SIGTERM)
+	var err error
 	select {
-	case <-h.waitCh:
+	case err = <-h.waitCh:
 	case <-time.After(10 * time.Second):
 		_ = h.cmd.Process.Kill()
-		<-h.waitCh
+		err = <-h.waitCh
+	}
+	if err != nil {
+		t.Logf("systemd-hostnamed exited uncleanly: %v", err)
 	}
 	h.cmd = nil
 }