diff --git a/.golangci.yml b/.golangci.yml
index a1edee29a6c..31e44bb76fc 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -26,13 +26,13 @@ linters:
     - perfsprint
     - revive
     - staticcheck
-    - tenv
     - testifylint
     - typecheck
     - unconvert
     - unparam
     - unused
     - usestdlibvars
+    - usetesting
 
 issues:
   # Maximum issues count per one linter.
diff --git a/detectors/gcp/cloud-function_test.go b/detectors/gcp/cloud-function_test.go
index 627441f7849..6133d5afaf2 100644
--- a/detectors/gcp/cloud-function_test.go
+++ b/detectors/gcp/cloud-function_test.go
@@ -6,7 +6,6 @@ package gcp
 import (
 	"context"
 	"errors"
-	"os"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -57,20 +56,8 @@ type want struct {
 }
 
 func TestCloudFunctionDetect(t *testing.T) {
-	oldValue, ok := os.LookupEnv(gcpFunctionNameKey)
-	if !ok {
-		err := os.Setenv(gcpFunctionNameKey, functionName)
-		if err != nil {
-			t.Error("unable to set environment variable ", err)
-		}
-	}
-	defer func() {
-		if !ok {
-			_ = os.Unsetenv(gcpFunctionNameKey)
-		} else {
-			_ = os.Setenv(gcpFunctionNameKey, oldValue)
-		}
-	}()
+	t.Setenv(gcpFunctionNameKey, functionName)
+
 	tests := []struct {
 		name     string
 		cr       *CloudRun
@@ -143,15 +130,6 @@ func TestCloudFunctionDetect(t *testing.T) {
 }
 
 func TestNotOnCloudFunction(t *testing.T) {
-	oldValue, ok := os.LookupEnv(gcpFunctionNameKey)
-	if ok {
-		_ = os.Unsetenv(gcpFunctionNameKey)
-	}
-	defer func() {
-		if ok {
-			_ = os.Setenv(gcpFunctionNameKey, oldValue)
-		}
-	}()
 	detector := NewCloudFunction()
 	res, err := detector.Detect(context.Background())
 	if err != nil {