diff --git a/.github/workflows/validate_pull_request.yml b/.github/workflows/validate_pull_request.yml
index 36a961369..9c2594e86 100644
--- a/.github/workflows/validate_pull_request.yml
+++ b/.github/workflows/validate_pull_request.yml
@@ -23,6 +23,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v3
       - run: |
+          rm -r -f ./Tests/CSharpier.MsBuild.Test
           dotnet tool restore
           dotnet csharpier . --check
   test_msbuild:
@@ -33,5 +34,5 @@ jobs:
       - uses: actions/setup-dotnet@v3
       - run: |
           dotnet pack Src/CSharpier.MsBuild/CSharpier.MsBuild.csproj -o nupkg /p:Version=0.0.1
-          dotnet build Src/Tests/CSharpier.MsBuild.Test
+          docker build -f ./Tests/CSharpier.MsBuild.Test/Dockerfile .
 
diff --git a/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/.gitignore b/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/.gitignore
new file mode 100644
index 000000000..a2ec253e5
--- /dev/null
+++ b/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/.gitignore
@@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/contentModel.xml
+/projectSettingsUpdater.xml
+/modules.xml
+/.idea.Test.iml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/.name b/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/.name
new file mode 100644
index 000000000..8318c86b3
--- /dev/null
+++ b/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/.name
@@ -0,0 +1 @@
+Test
\ No newline at end of file
diff --git a/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/encodings.xml b/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/encodings.xml
new file mode 100644
index 000000000..df87cf951
--- /dev/null
+++ b/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>
\ No newline at end of file
diff --git a/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/indexLayout.xml b/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/indexLayout.xml
new file mode 100644
index 000000000..7b08163ce
--- /dev/null
+++ b/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/vcs.xml b/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/vcs.xml
new file mode 100644
index 000000000..b2bdec2d7
--- /dev/null
+++ b/Tests/CSharpier.MsBuild.Test/.idea/.idea.Test/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Tests/CSharpier.MsBuild.Test/Dockerfile b/Tests/CSharpier.MsBuild.Test/Dockerfile
index 265701c7a..9859bf7df 100644
--- a/Tests/CSharpier.MsBuild.Test/Dockerfile
+++ b/Tests/CSharpier.MsBuild.Test/Dockerfile
@@ -1,10 +1,6 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS base
 
-COPY 
+COPY ./nupkg ./nupkg
+COPY ./Tests/CSharpier.MsBuild.Test ./Tests/CSharpier.MsBuild.Test
 
-COPY nupkg ./nupkg
-COPY Src/CSharpier.MsBuild.Test ./Src/CSharpier.MsBuild.Test
-
-WORKDIR Src/CSharpier.MsBuild.Test
-
-RUN dotnet build -c Release
+RUN dotnet build Tests/CSharpier.MsBuild.Test -c Release
diff --git a/Tests/CSharpier.MsBuild.Test/Test.sln b/Tests/CSharpier.MsBuild.Test/Test.sln
new file mode 100644
index 000000000..b6dfe4a18
--- /dev/null
+++ b/Tests/CSharpier.MsBuild.Test/Test.sln
@@ -0,0 +1,27 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "net8.0", "net8.0\net8.0.csproj", "{8D0B3F99-1F30-48D9-BCA2-082FBD34E718}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "net7.0", "net7.0\net7.0.csproj", "{86D709CC-6B25-4574-8376-B5EC1AA35FA4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "net48", "net48\net48.csproj", "{C0423F42-4ABD-4BBB-9458-15D7AED8AD94}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8D0B3F99-1F30-48D9-BCA2-082FBD34E718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D0B3F99-1F30-48D9-BCA2-082FBD34E718}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D0B3F99-1F30-48D9-BCA2-082FBD34E718}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D0B3F99-1F30-48D9-BCA2-082FBD34E718}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86D709CC-6B25-4574-8376-B5EC1AA35FA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86D709CC-6B25-4574-8376-B5EC1AA35FA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86D709CC-6B25-4574-8376-B5EC1AA35FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86D709CC-6B25-4574-8376-B5EC1AA35FA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0423F42-4ABD-4BBB-9458-15D7AED8AD94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0423F42-4ABD-4BBB-9458-15D7AED8AD94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0423F42-4ABD-4BBB-9458-15D7AED8AD94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0423F42-4ABD-4BBB-9458-15D7AED8AD94}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/Tests/CSharpier.MsBuild.Test/dirs.csproj b/Tests/CSharpier.MsBuild.Test/dirs.csproj
deleted file mode 100644
index 2e256849e..000000000
--- a/Tests/CSharpier.MsBuild.Test/dirs.csproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project Sdk="Microsoft.Build.Traversal">
-  <ItemGroup>
-    <ProjectReference Include="**\*.csproj" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Tests/CSharpier.MsBuild.Test/nuget.config b/Tests/CSharpier.MsBuild.Test/nuget.config
index 3f989b9af..ac2c7b05b 100644
--- a/Tests/CSharpier.MsBuild.Test/nuget.config
+++ b/Tests/CSharpier.MsBuild.Test/nuget.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="Test Source" value="../../nupkg" />
+    <add key="Local" value="../../nupkg" />
   </packageSources>
 </configuration>
\ No newline at end of file