diff --git a/src/DelegateDecompiler.EntityFramework.Tests/DelegateDecompiler.EntityFramework.Tests.csproj b/src/DelegateDecompiler.EntityFramework.Tests/DelegateDecompiler.EntityFramework.Tests.csproj
index 1cd85a36..4a74bad6 100644
--- a/src/DelegateDecompiler.EntityFramework.Tests/DelegateDecompiler.EntityFramework.Tests.csproj
+++ b/src/DelegateDecompiler.EntityFramework.Tests/DelegateDecompiler.EntityFramework.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net45;net8.0</TargetFrameworks>
     <Copyright>Copyright © Dave Glick 2014, Jon Smith 2014, Alexander Zaytsev 2014 - 2021</Copyright>
   </PropertyGroup>
 
diff --git a/src/DelegateDecompiler.EntityFramework.Tests/Helpers/MarkupFileHelpers.cs b/src/DelegateDecompiler.EntityFramework.Tests/Helpers/MarkupFileHelpers.cs
index aa97a32b..6766f6d6 100644
--- a/src/DelegateDecompiler.EntityFramework.Tests/Helpers/MarkupFileHelpers.cs
+++ b/src/DelegateDecompiler.EntityFramework.Tests/Helpers/MarkupFileHelpers.cs
@@ -65,15 +65,9 @@ static bool GetMarkupFileDirectory(string pathToManipulate, string alternateTest
             {
                 @"\bin\debug",
                 @"\bin\debug\net45",
-                @"\bin\debug\netcoreapp2.1",
-                @"\bin\debug\netcoreapp3.1",
-                @"\bin\debug\net6.0",
                 @"\bin\debug\net8.0",
                 @"\bin\release",
                 @"\bin\release\net45",
-                @"\bin\release\netcoreapp2.1",
-                @"\bin\release\netcoreapp3.1",
-                @"\bin\release\net6.0",
                 @"\bin\release\net8.0",
             };
             foreach (var ending in endings)
diff --git a/src/DelegateDecompiler.EntityFrameworkCore.Tests/DelegateDecompiler.EntityFrameworkCore.Tests.csproj b/src/DelegateDecompiler.EntityFrameworkCore.Tests/DelegateDecompiler.EntityFrameworkCore.Tests.csproj
index b405be53..a377d171 100644
--- a/src/DelegateDecompiler.EntityFrameworkCore.Tests/DelegateDecompiler.EntityFrameworkCore.Tests.csproj
+++ b/src/DelegateDecompiler.EntityFrameworkCore.Tests/DelegateDecompiler.EntityFrameworkCore.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Copyright>Copyright © Dave Glick 2014, Jon Smith 2014, Alexander Zaytsev 2014 - 2021</Copyright>
     <DefineConstants>$(DefineConstants);EF_CORE</DefineConstants>
     <RootNamespace>DelegateDecompiler.EntityFramework.Tests</RootNamespace>
diff --git a/src/DelegateDecompiler.EntityFrameworkCore3.Tests/DelegateDecompiler.EntityFrameworkCore3.Tests.csproj b/src/DelegateDecompiler.EntityFrameworkCore3.Tests/DelegateDecompiler.EntityFrameworkCore3.Tests.csproj
index dd1a86e1..c2b3641f 100644
--- a/src/DelegateDecompiler.EntityFrameworkCore3.Tests/DelegateDecompiler.EntityFrameworkCore3.Tests.csproj
+++ b/src/DelegateDecompiler.EntityFrameworkCore3.Tests/DelegateDecompiler.EntityFrameworkCore3.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Dave Glick 2014, Jon Smith 2014, Alexander Zaytsev 2014 - 2021</Copyright>
     <DefineConstants>$(DefineConstants);EF_CORE;EF_CORE3</DefineConstants>
     <RootNamespace>DelegateDecompiler.EntityFramework.Tests</RootNamespace>
diff --git a/src/DelegateDecompiler.EntityFrameworkCore6.Tests/DelegateDecompiler.EntityFrameworkCore6.Tests.csproj b/src/DelegateDecompiler.EntityFrameworkCore6.Tests/DelegateDecompiler.EntityFrameworkCore6.Tests.csproj
index 53ab9f4c..7a28a0e0 100644
--- a/src/DelegateDecompiler.EntityFrameworkCore6.Tests/DelegateDecompiler.EntityFrameworkCore6.Tests.csproj
+++ b/src/DelegateDecompiler.EntityFrameworkCore6.Tests/DelegateDecompiler.EntityFrameworkCore6.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Dave Glick 2014, Jon Smith 2014, Alexander Zaytsev 2014 - 2021</Copyright>
     <DefineConstants>$(DefineConstants);EF_CORE;EF_CORE3;EF_CORE5</DefineConstants>
     <RootNamespace>DelegateDecompiler.EntityFramework.Tests</RootNamespace>
diff --git a/src/DelegateDecompiler.Tests.VB/DelegateDecompiler.Tests.VB.vbproj b/src/DelegateDecompiler.Tests.VB/DelegateDecompiler.Tests.VB.vbproj
index ff03ba13..26d8352f 100644
--- a/src/DelegateDecompiler.Tests.VB/DelegateDecompiler.Tests.VB.vbproj
+++ b/src/DelegateDecompiler.Tests.VB/DelegateDecompiler.Tests.VB.vbproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net40;net45;net8.0</TargetFrameworks>
     <Copyright>Copyright © Alexander Zaytsev 2016 - 2021</Copyright>
   </PropertyGroup>
 
diff --git a/src/DelegateDecompiler.Tests/DelegateDecompiler.Tests.csproj b/src/DelegateDecompiler.Tests/DelegateDecompiler.Tests.csproj
index 284c8466..5f2f2cf6 100644
--- a/src/DelegateDecompiler.Tests/DelegateDecompiler.Tests.csproj
+++ b/src/DelegateDecompiler.Tests/DelegateDecompiler.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net40;net45;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test.cmd b/test.cmd
index 7b5b5790..a0e5fc9a 100644
--- a/test.cmd
+++ b/test.cmd
@@ -6,10 +6,10 @@ nunit3-console ^
  src\DelegateDecompiler.EntityFramework.Tests\bin\Release\net45\DelegateDecompiler.EntityFramework.Tests.dll ^
  --result=DelegateDecompiler.testsresults.xml;format=AppVeyor && ^
 
-dotnet test --no-build -c Release -f netcoreapp3.1 src\DelegateDecompiler.Tests && ^
-dotnet test --no-build -c Release -f netcoreapp3.1 src\DelegateDecompiler.Tests.VB && ^
-dotnet test --no-build -c Release -f netcoreapp3.1 src\DelegateDecompiler.EntityFramework.Tests && ^
-dotnet test --no-build -c Release -f netcoreapp3.1 src\DelegateDecompiler.EntityFrameworkCore.Tests && ^
-dotnet test --no-build -c Release -f netcoreapp3.1 src\DelegateDecompiler.EntityFrameworkCore3.Tests && ^
-dotnet test --no-build -c Release -f net6.0 src\DelegateDecompiler.EntityFrameworkCore6.Tests
+dotnet test --no-build -c Release -f net8.0 src\DelegateDecompiler.Tests && ^
+dotnet test --no-build -c Release -f net8.0 src\DelegateDecompiler.Tests.VB && ^
+dotnet test --no-build -c Release -f net8.0 src\DelegateDecompiler.EntityFramework.Tests && ^
+dotnet test --no-build -c Release -f net8.0 src\DelegateDecompiler.EntityFrameworkCore.Tests && ^
+dotnet test --no-build -c Release -f net8.0 src\DelegateDecompiler.EntityFrameworkCore3.Tests && ^
+dotnet test --no-build -c Release -f net8.0 src\DelegateDecompiler.EntityFrameworkCore6.Tests
 dotnet test --no-build -c Release -f net8.0 src\DelegateDecompiler.EntityFrameworkCore8.Tests