diff --git a/test/EFCore.Analyzers.Tests/InternalUsageDiagnosticAnalyzerTests.cs b/test/EFCore.Analyzers.Tests/InternalUsageDiagnosticAnalyzerTests.cs
index 2b4af91332a..90eed492da1 100644
--- a/test/EFCore.Analyzers.Tests/InternalUsageDiagnosticAnalyzerTests.cs
+++ b/test/EFCore.Analyzers.Tests/InternalUsageDiagnosticAnalyzerTests.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore;
 
 using VerifyCS = CSharpAnalyzerVerifier<InternalUsageDiagnosticAnalyzer>;
 
-public class InternalUsageDiagnosticAnalyzerTests
+//Issue #37106
+internal class InternalUsageDiagnosticAnalyzerTests
 {
     [ConditionalFact]
     public Task Invocation_on_type_in_internal_namespace()
diff --git a/test/EFCore.Analyzers.Tests/StringConcatenationInRawQueriesAnalyzerTests.cs b/test/EFCore.Analyzers.Tests/StringConcatenationInRawQueriesAnalyzerTests.cs
index 80a8ed665e5..48963734feb 100644
--- a/test/EFCore.Analyzers.Tests/StringConcatenationInRawQueriesAnalyzerTests.cs
+++ b/test/EFCore.Analyzers.Tests/StringConcatenationInRawQueriesAnalyzerTests.cs
@@ -1,13 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.EntityFrameworkCore;
-
 using Microsoft.CodeAnalysis.Testing;
 
+namespace Microsoft.EntityFrameworkCore;
+
 using Verify = CSharpAnalyzerVerifier<StringsUsageInRawQueriesDiagnosticAnalyzer>;
 
-public class StringConcatenationInRawQueriesAnalyzerTests
+//Issue #37106
+internal class StringConcatenationInRawQueriesAnalyzerTests
 {
     public static readonly TheoryData<string> DoNotReportData =
     [
diff --git a/test/EFCore.Analyzers.Tests/StringInterpolationInRawQueriesAnalyzerTests.cs b/test/EFCore.Analyzers.Tests/StringInterpolationInRawQueriesAnalyzerTests.cs
index e375ce540cb..96ebd077586 100644
--- a/test/EFCore.Analyzers.Tests/StringInterpolationInRawQueriesAnalyzerTests.cs
+++ b/test/EFCore.Analyzers.Tests/StringInterpolationInRawQueriesAnalyzerTests.cs
@@ -1,13 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.EntityFrameworkCore;
-
 using Microsoft.CodeAnalysis.Testing;
 
+namespace Microsoft.EntityFrameworkCore;
+
 using Verify = CSharpCodeFixVerifier<StringsUsageInRawQueriesDiagnosticAnalyzer, InterpolatedStringUsageInRawQueriesCodeFixProvider>;
 
-public class StringInterpolationInRawQueriesAnalyzerTests
+//Issue #37106
+internal class StringInterpolationInRawQueriesAnalyzerTests
 {
     public static readonly TheoryData<string> DoNotReportData =
     [
diff --git a/test/EFCore.Analyzers.Tests/UninitializedDbSetDiagnosticSuppressorTests.cs b/test/EFCore.Analyzers.Tests/UninitializedDbSetDiagnosticSuppressorTests.cs
index dea9afcd00e..6b4ad43390b 100644
--- a/test/EFCore.Analyzers.Tests/UninitializedDbSetDiagnosticSuppressorTests.cs
+++ b/test/EFCore.Analyzers.Tests/UninitializedDbSetDiagnosticSuppressorTests.cs
@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore;
 
 using VerifyCS = CSharpAnalyzerVerifier<UninitializedDbSetDiagnosticSuppressor>;
 
-public class UninitializedDbSetDiagnosticSuppressorTests
+//Issue #37106
+internal class UninitializedDbSetDiagnosticSuppressorTests
 {
     [ConditionalFact]
     public Task DbSet_property_on_DbContext_is_suppressed()