diff --git a/templates/integrated/Source/MyProject.csproj b/templates/integrated/Source/MyProject.csproj
index 1d11217..3919447 100644
--- a/templates/integrated/Source/MyProject.csproj
+++ b/templates/integrated/Source/MyProject.csproj
@@ -1,37 +1,42 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <OutputType>Exe</OutputType>
         <NoWarn>CS1591;CA2016;CS7022</NoWarn>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <DisableTestingPlatformServerCapability>true</DisableTestingPlatformServerCapability>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AWSSDK.SimpleEmailV2" Version="4.0.14.9"/>
-        <PackageReference Include="BCrypt.Net-Next" Version="4.2.1"/>
-        <PackageReference Include="FastEndpoints" Version="8.3.0-rc.1"/>
-        <PackageReference Include="FastEndpoints.Generator" Version="8.3.0-rc.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
-        <PackageReference Include="FastEndpoints.Security" Version="8.3.0-rc.1"/>
-        <PackageReference Include="FastEndpoints.OpenApi" Version="8.3.0-rc.1"/>
-        <PackageReference Include="LettuceEncrypt" Version="1.3.3"/>
-        <PackageReference Include="MessagePack" Version="3.1.7"/>
-        <PackageReference Include="MongoDB.Entities" Version="25.1.0"/>
+        <PackageReference Include="AWSSDK.SimpleEmailV2" Version="4.0.14.9" />
+        <PackageReference Include="BCrypt.Net-Next" Version="4.2.1" />
+        <PackageReference Include="FastEndpoints" Version="8.3.0-rc.1" />
+        <PackageReference Include="FastEndpoints.Generator" Version="8.3.0-rc.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+        <PackageReference Include="FastEndpoints.Security" Version="8.3.0-rc.1" />
+        <PackageReference Include="FastEndpoints.OpenApi" Version="8.3.0-rc.1" />
+        <PackageReference Include="LettuceEncrypt" Version="1.3.3" />
+        <PackageReference Include="MessagePack" Version="3.1.7" />
+        <PackageReference Include="MongoDB.Entities" Version="25.1.0" />
     </ItemGroup>
 
-    <!-- exclude test related code from release build -->
+    <!-- exclude test related code from release build -->    
     <ItemGroup Condition="'$(Configuration)' != 'Release'">
-        <PackageReference Include="FakeItEasy" Version="9.0.1"/>
-        <PackageReference Include="FastEndpoints.Testing" Version="8.3.0-rc.1"/>
-        <PackageReference Include="Shouldly" Version="4.3.0"/>
-        <PackageReference Include="xunit.v3" Version="4.0.0"/>
-        <Content Update="Tests\xunit.runner.json" TargetPath="xunit.runner.json"/>
+        <PackageReference Include="FakeItEasy" Version="9.0.1" />
+        <PackageReference Include="FastEndpoints.Testing" Version="8.3.0-rc.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
+        <PackageReference Include="Shouldly" Version="4.3.0" />
+        <PackageReference Include="xunit.v3" Version="4.0.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <Content Update="Tests\xunit.runner.json" TargetPath="xunit.runner.json" />
     </ItemGroup>
     <ItemGroup Condition="'$(Configuration)' == 'Release'">
-        <Compile Remove="**\Tests\**"/>
-        <Content Remove="**\Tests\**"/>
+        <Compile Remove="**\Tests\**" />
+        <Content Remove="**\Tests\**" />
     </ItemGroup>
     <!-- exclude test related code from release build-->
 
diff --git a/templates/integrated/Source/Program.cs b/templates/integrated/Source/Program.cs
index d274075..5695946 100644
--- a/templates/integrated/Source/Program.cs
+++ b/templates/integrated/Source/Program.cs
@@ -2,10 +2,12 @@
 using Amazon.SimpleEmailV2;
 using Dom;
 using LettuceEncrypt;
-using Xunit.MicrosoftTestingPlatform;
 
-if (args.Any(a => a == "dotnettestcli")) // this is a 'dotnet test' run
-    return await TestPlatformTestFramework.RunAsync(args, SelfRegisteredExtensions.AddSelfRegisteredExtensions);
+#if DEBUG
+using MyProject.Tests;
+if (TestDiscoveryHandler.IsTestRun(args, out var testRunner))
+    return await testRunner();
+#endif
 
 var bld = WebApplication.CreateBuilder(args);
 bld.Services
diff --git a/templates/integrated/Source/Tests/TestDiscoveryHandler.cs b/templates/integrated/Source/Tests/TestDiscoveryHandler.cs
new file mode 100644
index 0000000..6c7568b
--- /dev/null
+++ b/templates/integrated/Source/Tests/TestDiscoveryHandler.cs
@@ -0,0 +1,28 @@
+using System.Diagnostics.CodeAnalysis;
+using Xunit.MicrosoftTestingPlatform;
+using Xunit.Runner.InProc.SystemConsole;
+
+namespace MyProject.Tests;
+
+public static class TestDiscoveryHandler
+{
+    public static bool IsTestRun(string[] args, [NotNullWhen(true)] out Func<Task<int>>? testRunner)
+    {
+        if (args.Contains("@@")) // this is a 'dotnet test' run from the test explorer
+        {
+            testRunner = () =>
+                ConsoleRunner.Run(args);
+            return true;
+        }
+
+        if (args.Any(a => a == "dotnettestcli")) // this is a 'dotnet test' run from the CLI
+        {
+            testRunner = () =>
+                TestPlatformTestFramework.RunAsync(args, SelfRegisteredExtensions.AddSelfRegisteredExtensions);
+            return true;
+        }
+
+        testRunner = null;
+        return false;
+    }
+}