diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 940df6e0..16595839 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: golangci/golangci-lint:v1.58.0
+    container: golangci/golangci-lint:v1.58.2
     steps:
     - uses: actions/cache@v2
       with:
diff --git a/Makefile b/Makefile
index e2b8f407..75cd52e3 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ GORUN=$(GOCMD) run
 GOBUILD=$(GOCMD) build -v -ldflags $(LD_FLAGS) -trimpath
 
 CC_TEST_REPORTER_ID=6e107e510c5479f40b0ce9166a254f3f1ee0bc547b3e48281bada1a5a32bb56d
-GOLANGCI_LINT_VERSION=v1.58.0
+GOLANGCI_LINT_VERSION=v1.58.2
 BIN_PATH=$$HOME/bin
 
 GO_PACKAGES=./...
diff --git a/pkg/container/runtime/docker/docker_test.go b/pkg/container/runtime/docker/docker_test.go
index 360b9be5..7f442171 100644
--- a/pkg/container/runtime/docker/docker_test.go
+++ b/pkg/container/runtime/docker/docker_test.go
@@ -31,6 +31,7 @@ func TestNewClient(t *testing.T) {
 	// TODO does this kind of simple tests make sense? Integration tests calls the same thing
 	// anyway. Or maybe we should simply skip error checking in integration tests to simplify them?
 	c := &docker.Config{
+		//nolint:nilnil // Just test code.
 		ClientGetter: func(...client.Opt) (docker.Client, error) { return nil, nil },
 	}
 
@@ -54,6 +55,7 @@ func TestNewClientWithHost(t *testing.T) {
 				t.Log(k, v)
 			}
 
+			//nolint:nilnil // Just test code.
 			return nil, nil
 		},
 	}
@@ -95,7 +97,7 @@ func TestSanitizeImageName(t *testing.T) {
 				ImagePullF: func(context.Context, string, dockertypes.ImagePullOptions) (io.ReadCloser, error) {
 					t.Fatalf("Unexpected call to image pull")
 
-					return nil, nil
+					return nil, fmt.Errorf("unexpected call to image pull")
 				},
 			}, nil
 		},