diff --git a/All.sln b/All.sln
index 22981381fb..99bc594004 100644
--- a/All.sln
+++ b/All.sln
@@ -78,7 +78,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Tests", "test\EFCore
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Analyzers", "src\EFCore.Analyzers\EFCore.Analyzers.csproj", "{C0D4A199-3ED4-447B-8657-0502493294E7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Analyzers.Test", "test\EFCore.Analyzers.Tests\EFCore.Analyzers.Test.csproj", "{7BC66E5C-BAA3-420B-8331-22821EBA361A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Analyzers.Tests", "test\EFCore.Analyzers.Tests\EFCore.Analyzers.Tests.csproj", "{7BC66E5C-BAA3-420B-8331-22821EBA361A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Cosmos", "src\EFCore.Cosmos\EFCore.Cosmos.csproj", "{6C115EF9-519E-4A4E-BD02-3801777BFEBA}"
 EndProject
diff --git a/EFCore.Cosmos.slnf b/EFCore.Cosmos.slnf
index fed013ff70..11538420b9 100644
--- a/EFCore.Cosmos.slnf
+++ b/EFCore.Cosmos.slnf
@@ -7,7 +7,7 @@
       "src\\EFCore.Cosmos\\EFCore.Cosmos.csproj",
       "src\\EFCore.Proxies\\EFCore.Proxies.csproj",
       "src\\EFCore\\EFCore.csproj",
-      "test\\EFCore.Analyzers.Tests\\EFCore.Analyzers.Test.csproj",
+      "test\\EFCore.Analyzers.Tests\\EFCore.Analyzers.Tests.csproj",
       "test\\EFCore.Cosmos.FunctionalTests\\EFCore.Cosmos.FunctionalTests.csproj",
       "test\\EFCore.Cosmos.Tests\\EFCore.Cosmos.Tests.csproj",
       "test\\EFCore.InMemory.FunctionalTests\\EFCore.InMemory.FunctionalTests.csproj",
diff --git a/EFCore.Relational.slnf b/EFCore.Relational.slnf
index 90819ad6c5..f09cce4da2 100644
--- a/EFCore.Relational.slnf
+++ b/EFCore.Relational.slnf
@@ -14,7 +14,7 @@
       "src\\EFCore.Sqlite.NTS\\EFCore.Sqlite.NTS.csproj",
       "src\\EFCore.Sqlite\\EFCore.Sqlite.csproj",
       "src\\EFCore\\EFCore.csproj",
-      "test\\EFCore.Analyzers.Tests\\EFCore.Analyzers.Test.csproj",
+      "test\\EFCore.Analyzers.Tests\\EFCore.Analyzers.Tests.csproj",
       "test\\EFCore.CrossStore.FunctionalTests\\EFCore.CrossStore.FunctionalTests.csproj",
       "test\\EFCore.Design.Tests\\EFCore.Design.Tests.csproj",
       "test\\EFCore.InMemory.FunctionalTests\\EFCore.InMemory.FunctionalTests.csproj",
diff --git a/EFCore.Runtime.slnf b/EFCore.Runtime.slnf
index 0f22354b08..0c47bc9345 100644
--- a/EFCore.Runtime.slnf
+++ b/EFCore.Runtime.slnf
@@ -16,7 +16,7 @@
       "src\\EFCore.Sqlite\\EFCore.Sqlite.csproj",
       "src\\EFCore\\EFCore.csproj",
       "src\\Microsoft.Data.Sqlite.Core\\Microsoft.Data.Sqlite.Core.csproj",
-      "test\\EFCore.Analyzers.Tests\\EFCore.Analyzers.Test.csproj",
+      "test\\EFCore.Analyzers.Tests\\EFCore.Analyzers.Tests.csproj",
       "test\\EFCore.Cosmos.FunctionalTests\\EFCore.Cosmos.FunctionalTests.csproj",
       "test\\EFCore.Cosmos.Tests\\EFCore.Cosmos.Tests.csproj",
       "test\\EFCore.CrossStore.FunctionalTests\\EFCore.CrossStore.FunctionalTests.csproj",
diff --git a/EFCore.Sqlite.slnf b/EFCore.Sqlite.slnf
index 6a36227f73..d224e987dc 100644
--- a/EFCore.Sqlite.slnf
+++ b/EFCore.Sqlite.slnf
@@ -12,7 +12,7 @@
       "src\\EFCore.Sqlite.NTS\\EFCore.Sqlite.NTS.csproj",
       "src\\EFCore\\EFCore.csproj",
       "src\\Microsoft.Data.Sqlite.Core\\Microsoft.Data.Sqlite.Core.csproj",
-      "test\\EFCore.Analyzers.Tests\\EFCore.Analyzers.Test.csproj",
+      "test\\EFCore.Analyzers.Tests\\EFCore.Analyzers.Tests.csproj",
       "test\\EFCore.Design.Tests\\EFCore.Design.Tests.csproj",
       "test\\EFCore.InMemory.FunctionalTests\\EFCore.InMemory.FunctionalTests.csproj",
       "test\\EFCore.InMemory.Tests\\EFCore.InMemory.Tests.csproj",
diff --git a/EFCore.slnf b/EFCore.slnf
index febfd94576..2cd0750269 100644
--- a/EFCore.slnf
+++ b/EFCore.slnf
@@ -23,7 +23,7 @@
       "src\\EFCore\\EFCore.csproj",
       "src\\dotnet-ef\\dotnet-ef.csproj",
       "src\\ef\\ef.csproj",
-      "test\\EFCore.Analyzers.Tests\\EFCore.Analyzers.Test.csproj",
+      "test\\EFCore.Analyzers.Tests\\EFCore.Analyzers.Tests.csproj",
       "test\\EFCore.Cosmos.FunctionalTests\\EFCore.Cosmos.FunctionalTests.csproj",
       "test\\EFCore.Cosmos.Tests\\EFCore.Cosmos.Tests.csproj",
       "test\\EFCore.CrossStore.FunctionalTests\\EFCore.CrossStore.FunctionalTests.csproj",
diff --git a/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Test.csproj b/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj
similarity index 100%
rename from test/EFCore.Analyzers.Tests/EFCore.Analyzers.Test.csproj
rename to test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj
diff --git a/test/EFCore.Analyzers.Tests/InternalUsageDiagnosticAnalyzerTest.cs b/test/EFCore.Analyzers.Tests/InternalUsageDiagnosticAnalyzerTest.cs
index ce71742c32..961a8df830 100644
--- a/test/EFCore.Analyzers.Tests/InternalUsageDiagnosticAnalyzerTest.cs
+++ b/test/EFCore.Analyzers.Tests/InternalUsageDiagnosticAnalyzerTest.cs
@@ -3,9 +3,9 @@
 
 using System.Linq;
 using System.Threading.Tasks;
-using EFCore.Analyzers.Test.TestUtilities;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.EntityFrameworkCore.TestUtilities;
 using Xunit;
 
 namespace Microsoft.EntityFrameworkCore
diff --git a/test/EFCore.Analyzers.Tests/TestUtilities/DiagnosticAnalyzerTestBase.cs b/test/EFCore.Analyzers.Tests/TestUtilities/DiagnosticAnalyzerTestBase.cs
index c420ef4d65..b6e070ebd8 100644
--- a/test/EFCore.Analyzers.Tests/TestUtilities/DiagnosticAnalyzerTestBase.cs
+++ b/test/EFCore.Analyzers.Tests/TestUtilities/DiagnosticAnalyzerTestBase.cs
@@ -12,7 +12,7 @@ using Microsoft.CodeAnalysis.Text;
 using Microsoft.Extensions.DependencyModel;
 using Xunit;
 
-namespace EFCore.Analyzers.Test.TestUtilities
+namespace Microsoft.EntityFrameworkCore.TestUtilities
 {
     public abstract class DiagnosticAnalyzerTestBase
     {