diff --git a/fs/config_test.go b/fs/config_test.go
index f9157bbf6..141f1185d 100644
--- a/fs/config_test.go
+++ b/fs/config_test.go
@@ -11,7 +11,9 @@ func TestGetConfig(t *testing.T) {
 	ctx := context.Background()
 
 	// Check nil
-	config := GetConfig(nil) //lint:ignore SA1012 we want to test passing a nil Context and therefore ignore lint suggestion of using context.TODO
+	//lint:ignore SA1012 false positive when running staticcheck, we want to test passing a nil Context and therefore ignore lint suggestion to use context.TODO
+	//nolint:staticcheck // Don't include staticcheck when running golangci-lint to avoid SA1012
+	config := GetConfig(nil)
 	assert.Equal(t, globalConfig, config)
 
 	// Check empty config
diff --git a/fs/filter/filter_test.go b/fs/filter/filter_test.go
index ca24ecf27..91723f0a0 100644
--- a/fs/filter/filter_test.go
+++ b/fs/filter/filter_test.go
@@ -848,7 +848,9 @@ func TestGetConfig(t *testing.T) {
 	ctx := context.Background()
 
 	// Check nil
-	config := GetConfig(nil) //lint:ignore SA1012 we want to test passing a nil Context and therefore ignore lint suggestion of using context.TODO
+	//lint:ignore SA1012 false positive when running staticcheck, we want to test passing a nil Context and therefore ignore lint suggestion to use context.TODO
+	//nolint:staticcheck // Don't include staticcheck when running golangci-lint to avoid SA1012
+	config := GetConfig(nil)
 	assert.Equal(t, globalConfig, config)
 
 	// Check empty config