diff --git a/.github/workflows/NUnitConsoleAndEngine.CI.yml b/.github/workflows/NUnitConsoleAndEngine.CI.yml
index d218973ba..c7991d975 100644
--- a/.github/workflows/NUnitConsoleAndEngine.CI.yml
+++ b/.github/workflows/NUnitConsoleAndEngine.CI.yml
@@ -31,12 +31,14 @@ jobs:
         with:
           fetch-depth: 0
 
+        # Ensure all required runtimes are available
       - name: 🛠️ Setup .NET
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
             3.1.x
             6.0.x
+            7.0.x
             8.0.100
 
       - name: 🔧 Install dotnet tools
diff --git a/build.cake b/build.cake
index a753542bc..b10527b19 100644
--- a/build.cake
+++ b/build.cake
@@ -63,17 +63,13 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
             HasFiles("LICENSE.txt", "NOTICES.txt"),
             HasDirectory("tools").WithFiles("nunit3-console.exe", "nunit3-console.exe.config").AndFiles(ENGINE_FILES),
             HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES),
-            HasDirectory("tools/agents/netcoreapp3.1").WithFiles(AGENT_FILES_NETCORE),
             HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE),
-            HasDirectory("tools/agents/net7.0").WithFiles(AGENT_FILES_NETCORE),
             HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE)
         },
         symbols: new PackageCheck[] {
             HasDirectory("tools").WithFiles(ENGINE_PDB_FILES).AndFile("nunit3-console.pdb"),
             HasDirectory("tools/agents/net462").WithFiles(AGENT_PDB_FILES),
-            HasDirectory("tools/agents/netcoreapp3.1").WithFiles(AGENT_PDB_FILES_NETCORE),
             HasDirectory("tools/agents/net6.0").WithFiles(AGENT_PDB_FILES_NETCORE),
-            HasDirectory("tools/agents/net7.0").WithFiles(AGENT_PDB_FILES_NETCORE),
             HasDirectory("tools/agents/net8.0").WithFiles(AGENT_PDB_FILES_NETCORE)
         },
         testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
@@ -105,9 +101,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
         checks: new PackageCheck[] {
             HasDirectory("tools").WithFiles("LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit3-console.exe", "nunit3-console.exe.config").AndFiles(ENGINE_FILES),
             HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES),
-            HasDirectory("tools/agents/netcoreapp3.1").WithFiles(AGENT_FILES_NETCORE),
             HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE),
-            HasDirectory("tools/agents/net7.0").WithFiles(AGENT_FILES_NETCORE),
             HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE)
         },
         testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
@@ -126,14 +120,8 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
             HasDirectory("NUnit.Extension.NUnitV2ResultWriter.3.8.0"),
             HasDirectory("NUnit.Extension.TeamCityEventListener.1.0.7"),
             HasDirectory("NUnit.Extension.VSProjectLoader.3.9.0"),
-            //HasDirectory("bin/net462/addins").WithFiles(
-            //    "nunit.core.dll", "nunit.core.interfaces.dll", "nunit.engine.api.dll", 
-            //    "nunit.v2.driver.dll", "nunit-project-loader.dll", "nunit-v2-result-writer.dll", 
-            //    "teamcity-event-listener.dll", "vs-project-loader.dll"),
-            HasDirectory("bin/netcoreapp3.1").WithFiles(ENGINE_CORE_FILES).AndFiles(ENGINE_CORE_PDB_FILES),
             HasDirectory("bin/agents/net462").WithFiles(AGENT_FILES).AndFiles(AGENT_PDB_FILES),
             HasDirectory("bin/agents/net6.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE),
-            HasDirectory("bin/agents/net7.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE),
             HasDirectory("bin/agents/net8.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE),
         },
         testRunner: new ConsoleRunnerSelfTester(BuildSettings.ZipTestDirectory
diff --git a/choco/nunit-console-runner.nuspec b/choco/nunit-console-runner.nuspec
index d5eededcc..1b05a1446 100644
--- a/choco/nunit-console-runner.nuspec
+++ b/choco/nunit-console-runner.nuspec
@@ -49,16 +49,6 @@
     <file src = "nunit-agent.exe.ignore" target="tools/agents/net462" />
     <file src = "nunit-agent-x86.exe.ignore" target="tools/agents/net462" />
 
-    <file src = "$BIN_DIR$agents/netcoreapp3.1/nunit-agent.dll" target="tools/agents/netcoreapp3.1" />
-    <file src = "$BIN_DIR$agents/netcoreapp3.1/nunit-agent.dll.config" target="tools/agents/netcoreapp3.1" />
-    <file src = "$BIN_DIR$agents/netcoreapp3.1/nunit-agent.deps.json" target="tools/agents/netcoreapp3.1" />
-    <file src = "$BIN_DIR$agents/netcoreapp3.1/nunit-agent.runtimeconfig.json" target="tools/agents/netcoreapp3.1" />
-    <file src = "$BIN_DIR$agents/netcoreapp3.1/nunit.engine.api.dll" target="tools/agents/netcoreapp3.1" />
-    <file src = "$BIN_DIR$agents/netcoreapp3.1/nunit.engine.api.xml" target="tools/agents/netcoreapp3.1" />
-    <file src = "$BIN_DIR$agents/netcoreapp3.1/nunit.engine.core.dll" target="tools/agents/netcoreapp3.1" />
-    <file src = "$BIN_DIR$agents/netcoreapp3.1/testcentric.engine.metadata.dll" target="tools/agents/netcoreapp3.1" />
-    <file src = "$BIN_DIR$agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/netcoreapp3.1" />
-
     <file src = "$BIN_DIR$agents/net6.0/nunit-agent.dll" target="tools/agents/net6.0" />
     <file src = "$BIN_DIR$agents/net6.0/nunit-agent.dll.config" target="tools/agents/net6.0" />
     <file src = "$BIN_DIR$agents/net6.0/nunit-agent.deps.json" target="tools/agents/net6.0" />
@@ -69,16 +59,6 @@
     <file src = "$BIN_DIR$agents/net6.0/testcentric.engine.metadata.dll" target="tools/agents/net6.0" />
     <file src = "$BIN_DIR$agents/net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net6.0" />
 
-    <file src = "$BIN_DIR$agents/net7.0/nunit-agent.dll" target="tools/agents/net7.0" />
-    <file src = "$BIN_DIR$agents/net7.0/nunit-agent.dll.config" target="tools/agents/net7.0" />
-    <file src = "$BIN_DIR$agents/net7.0/nunit-agent.deps.json" target="tools/agents/net7.0" />
-    <file src = "$BIN_DIR$agents/net7.0/nunit-agent.runtimeconfig.json" target="tools/agents/net7.0" />
-    <file src = "$BIN_DIR$agents/net7.0/nunit.engine.api.dll" target="tools/agents/net7.0" />
-    <file src = "$BIN_DIR$agents/net7.0/nunit.engine.api.xml" target="tools/agents/net7.0" />
-    <file src = "$BIN_DIR$agents/net7.0/nunit.engine.core.dll" target="tools/agents/net7.0" />
-    <file src = "$BIN_DIR$agents/net7.0/testcentric.engine.metadata.dll" target="tools/agents/net7.0" />
-    <file src = "$BIN_DIR$agents/net7.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net7.0" />
-
     <file src = "$BIN_DIR$agents/net8.0/nunit-agent.dll" target="tools/agents/net8.0" />
     <file src = "$BIN_DIR$agents/net8.0/nunit-agent.dll.config" target="tools/agents/net8.0" />
     <file src = "$BIN_DIR$agents/net8.0/nunit-agent.deps.json" target="tools/agents/net8.0" />
diff --git a/nuget/engine/nunit.engine.nuspec b/nuget/engine/nunit.engine.nuspec
index 76dfd2651..fd455f97a 100644
--- a/nuget/engine/nunit.engine.nuspec
+++ b/nuget/engine/nunit.engine.nuspec
@@ -55,17 +55,6 @@
     <file src="agents/net462/nunit.engine.api.pdb" target="contentFiles/any/agents/net462" />
     <file src="agents/net462/testcentric.engine.metadata.dll" target="contentFiles/any/agents/net462" />
 
-    <file src="agents/netcoreapp3.1/nunit-agent.dll" target="contentFiles/any/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit-agent.pdb" target="contentFiles/any/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit-agent.dll.config" target="contentFiles/any/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit-agent.deps.json" target="contentFiles/any/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit-agent.runtimeconfig.json" target="contentFiles/any/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit.engine.core.dll" target="contentFiles/any/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit.engine.core.pdb" target="contentFiles/any/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit.engine.api.dll" target="contentFiles/any/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit.engine.api.pdb" target="contentFiles/any/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/testcentric.engine.metadata.dll" target="contentFiles/any/agents/netcoreapp3.1" />
-    
     <file src="net8.0/nunit.engine.dll" target="lib/net8.0" />
     <file src="net8.0/nunit.engine.pdb" target="lib/net8.0" />
     <file src="net8.0/nunit.engine.core.dll" target="lib/net8.0" />
diff --git a/nuget/runners/nunit.console-runner.nuspec b/nuget/runners/nunit.console-runner.nuspec
index 3489e8a10..ab7a0ccfd 100644
--- a/nuget/runners/nunit.console-runner.nuspec
+++ b/nuget/runners/nunit.console-runner.nuspec
@@ -40,19 +40,6 @@
     <file src="agents/net462/nunit.engine.core.pdb" target="tools/agents/net462" />
     <file src="agents/net462/testcentric.engine.metadata.dll" target="tools/agents/net462" />
 
-    <file src="agents/netcoreapp3.1/nunit-agent.dll" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit-agent.pdb" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit-agent.dll.config" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit-agent.deps.json" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit-agent.runtimeconfig.json" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit.engine.api.dll" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit.engine.api.pdb" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit.engine.api.xml" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit.engine.core.dll" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/nunit.engine.core.pdb" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/testcentric.engine.metadata.dll" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/netcoreapp3.1" />
-
     <file src="agents/net6.0/nunit-agent.dll" target="tools/agents/net6.0" />
     <file src="agents/net6.0/nunit-agent.pdb" target="tools/agents/net6.0" />
     <file src="agents/net6.0/nunit-agent.dll.config" target="tools/agents/net6.0" />
@@ -66,19 +53,6 @@
     <file src="agents/net6.0/testcentric.engine.metadata.dll" target="tools/agents/net6.0" />
     <file src="agents/net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net6.0" />
 
-    <file src="agents/net7.0/nunit-agent.dll" target="tools/agents/net7.0" />
-    <file src="agents/net7.0/nunit-agent.pdb" target="tools/agents/net7.0" />
-    <file src="agents/net7.0/nunit-agent.dll.config" target="tools/agents/net7.0" />
-    <file src="agents/net7.0/nunit-agent.deps.json" target="tools/agents/net7.0" />
-    <file src="agents/net7.0/nunit-agent.runtimeconfig.json" target="tools/agents/net7.0" />
-    <file src="agents/net7.0/nunit.engine.api.dll" target="tools/agents/net7.0" />
-    <file src="agents/net7.0/nunit.engine.api.pdb" target="tools/agents/net7.0" />
-    <file src="agents/net7.0/nunit.engine.api.xml" target="tools/agents/net7.0" />
-    <file src="agents/net7.0/nunit.engine.core.dll" target="tools/agents/net7.0" />
-    <file src="agents/net7.0/nunit.engine.core.pdb" target="tools/agents/net7.0" />
-    <file src="agents/net7.0/testcentric.engine.metadata.dll" target="tools/agents/net7.0" />
-    <file src="agents/net7.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net7.0" />
-
     <file src="agents/net8.0/nunit-agent.dll" target="tools/agents/net8.0" />
     <file src="agents/net8.0/nunit-agent.pdb" target="tools/agents/net8.0" />
     <file src="agents/net8.0/nunit-agent.dll.config" target="tools/agents/net8.0" />
diff --git a/src/NUnitEngine/nunit-agent/nunit-agent.csproj b/src/NUnitEngine/nunit-agent/nunit-agent.csproj
index b7ee2341a..1289644ee 100644
--- a/src/NUnitEngine/nunit-agent/nunit-agent.csproj
+++ b/src/NUnitEngine/nunit-agent/nunit-agent.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>nunit.agent</RootNamespace>
-    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>..\..\..\nunit.ico</ApplicationIcon>
     <GenerateSupportedRuntime>false</GenerateSupportedRuntime>
diff --git a/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs b/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs
index bbdc6f284..e84555837 100644
--- a/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs
+++ b/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs
@@ -127,7 +127,7 @@ public static string GetTestAgentExePath(RuntimeFramework targetRuntime, bool re
                     agentExtension = ".exe";
                     break;
                 case RuntimeType.NetCore:
-                    runtimeDir = major >= 8 ? "net8.0" : major == 7 ? "net7.0" : major == 6 ? "net6.0" : "netcoreapp3.1";
+                    runtimeDir = major >= 7 ? "net8.0" : "net6.0";
                     agentName = "nunit-agent";
                     agentExtension = ".dll";
                     break;