diff --git a/.golangci.yaml b/.golangci.yaml
index 78eef7c04..eba69a59a 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -162,7 +162,7 @@ linters:
     - makezero
     - rowserrcheck
     - sqlclosecheck
-    - tenv
+    - usetesting
     - unconvert
     - unparam
     - wastedassign
diff --git a/cli/exec/metadata_test.go b/cli/exec/metadata_test.go
index 231dc9cb2..0999bc504 100644
--- a/cli/exec/metadata_test.go
+++ b/cli/exec/metadata_test.go
@@ -84,7 +84,7 @@ func TestMetadataFromContext(t *testing.T) {
 	})
 
 	t.Run("InvalidFile", func(t *testing.T) {
-		tempFile, err := os.CreateTemp("", "invalid.json")
+		tempFile, err := os.CreateTemp(t.TempDir(), "invalid.json")
 		require.NoError(t, err)
 		t.Cleanup(func() { os.Remove(tempFile.Name()) })
 
@@ -132,7 +132,7 @@ func TestMetadataFromContext(t *testing.T) {
 
 func createTempFile(t *testing.T, content any) string {
 	t.Helper()
-	tempFile, err := os.CreateTemp("", "metadata.json")
+	tempFile, err := os.CreateTemp(t.TempDir(), "metadata.json")
 	require.NoError(t, err)
 	t.Cleanup(func() { os.Remove(tempFile.Name()) })
 
diff --git a/cmd/agent/core/config_test.go b/cmd/agent/core/config_test.go
index c3c94fd0b..d14e60012 100644
--- a/cmd/agent/core/config_test.go
+++ b/cmd/agent/core/config_test.go
@@ -26,7 +26,7 @@ func TestReadAgentIDFileNotExists(t *testing.T) {
 }
 
 func TestReadAgentIDFileExists(t *testing.T) {
-	tmpF, errTmpF := os.CreateTemp("", "tmp_")
+	tmpF, errTmpF := os.CreateTemp(t.TempDir(), "tmp_")
 	if !assert.NoError(t, errTmpF) {
 		return
 	}
@@ -48,7 +48,7 @@ func TestReadAgentIDFileExists(t *testing.T) {
 	actual = readAgentConfig(tmpF.Name())
 	assert.EqualValues(t, 33, actual.AgentID)
 
-	tmpF2, errTmpF := os.CreateTemp("", "tmp_")
+	tmpF2, errTmpF := os.CreateTemp(t.TempDir(), "tmp_")
 	if !assert.NoError(t, errTmpF) {
 		return
 	}