diff --git a/.golangci.yml b/.golangci.yml
index 70790675dc3..178fe6cc58d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -505,7 +505,7 @@ linters:
       constant-kind: true
 
     usetesting:
-      os-temp-dir: false
+      os-temp-dir: true
       context-background: true
       context-todo: true
 
@@ -623,16 +623,6 @@ linters:
         path: pkg/(appsec|acquisition|dumps|alertcontext|leakybucket|exprhelpers)
         text: 'rangeValCopy: .*'
 
-      - linters:
-          - usetesting
-        path: pkg/apiserver/(.+)_test.go
-        text: os.MkdirTemp.* could be replaced by t.TempDir.*
-
-      - linters:
-          - usetesting
-        path: pkg/apiserver/(.+)_test.go
-        text: os.CreateTemp.* could be replaced by os.CreateTemp.*
-
       - linters:
           - containedctx
         path: cmd/notification-file/main.go
diff --git a/pkg/acquisition/modules/appsec/appsec_rules_test.go b/pkg/acquisition/modules/appsec/appsec_rules_test.go
index 04c1edc21d6..3ab800f9a7e 100644
--- a/pkg/acquisition/modules/appsec/appsec_rules_test.go
+++ b/pkg/acquisition/modules/appsec/appsec_rules_test.go
@@ -3,7 +3,6 @@ package appsecacquisition
 import (
 	"net/http"
 	"net/url"
-	"os"
 	"path/filepath"
 	"testing"
 
@@ -384,7 +383,7 @@ toto
 				require.True(t, responses[0].InBandInterrupt)
 
 				// Might fail if you have artifacts from previous tests, but good enough 99% of the time
-				tmpFiles, err := filepath.Glob(filepath.Join(os.TempDir(), "crzmp*"))
+				tmpFiles, err := filepath.Glob(filepath.Join(t.TempDir(), "crzmp*"))
 				require.NoError(t, err)
 				require.Empty(t, tmpFiles)
 			},
diff --git a/pkg/apiserver/apiserver_test.go b/pkg/apiserver/apiserver_test.go
index e376cdff8a6..37b34eabf6b 100644
--- a/pkg/apiserver/apiserver_test.go
+++ b/pkg/apiserver/apiserver_test.go
@@ -54,13 +54,9 @@ func LoadTestConfig(t *testing.T) csconfig.Config {
 		MaxAge: maxAge,
 	}
 
-	tempDir, _ := os.MkdirTemp("", "crowdsec_tests")
-
-	t.Cleanup(func() { os.RemoveAll(tempDir) })
-
 	dbconfig := csconfig.DatabaseCfg{
 		Type:   "sqlite",
-		DbPath: filepath.Join(tempDir, "ent"),
+		DbPath: filepath.Join(t.TempDir(), "ent"),
 		Flush:  &flushConfig,
 	}
 	apiServerConfig := csconfig.LocalApiServerCfg{
@@ -104,13 +100,9 @@ func LoadTestConfigForwardedFor(t *testing.T) csconfig.Config {
 		MaxAge: maxAge,
 	}
 
-	tempDir, _ := os.MkdirTemp("", "crowdsec_tests")
-
-	t.Cleanup(func() { os.RemoveAll(tempDir) })
-
 	dbconfig := csconfig.DatabaseCfg{
 		Type:   "sqlite",
-		DbPath: filepath.Join(tempDir, "ent"),
+		DbPath: filepath.Join(t.TempDir(), "ent"),
 		Flush:  &flushConfig,
 	}
 	apiServerConfig := csconfig.LocalApiServerCfg{