diff --git a/Directory.Packages.props b/Directory.Packages.props
index 48d1d7ddb..976600a38 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -131,7 +131,7 @@
 		<PackageVersion Include="xunit.abstractions" Version="2.0.3"/>
 		<PackageVersion Include="xunit.assert" Version="2.9.2"/>
 		<PackageVersion Include="xunit.extensibility.execution" Version="2.9.2"/>
-		<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2"/>
+		<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0"/>
 	</ItemGroup>
 
 	<ItemGroup Label="Test Dependencies - Legacy" Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0'">
diff --git a/src/bunit.template/template/Company.BlazorTests1.csproj b/src/bunit.template/template/Company.BlazorTests1.csproj
index 5cf40a48c..46699f241 100644
--- a/src/bunit.template/template/Company.BlazorTests1.csproj
+++ b/src/bunit.template/template/Company.BlazorTests1.csproj
@@ -19,7 +19,7 @@
 	<ItemGroup>
 		<PackageReference Include="bunit" Version="#{RELEASE_VERSION}#" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-		<PackageReference Include="coverlet.collector" Version="6.0.2">
+		<PackageReference Include="coverlet.collector" Version="6.0.3">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
@@ -27,7 +27,7 @@
 
 	<ItemGroup Condition="'$(testFramework_xunit)' == 'true'">
 		<PackageReference Include="xunit" Version="2.9.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		  </PackageReference>
@@ -42,7 +42,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(testFramework_nunit)' == 'true'">
-		<PackageReference Include="NUnit" Version="4.3.0" />
+		<PackageReference Include="NUnit" Version="4.3.2" />
 		<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
 	</ItemGroup>
 
diff --git a/src/bunit.template/template/CounterCSharpTests.cs b/src/bunit.template/template/CounterCSharpTests.cs
index 254157b13..359fc45c4 100644
--- a/src/bunit.template/template/CounterCSharpTests.cs
+++ b/src/bunit.template/template/CounterCSharpTests.cs
@@ -7,6 +7,7 @@ namespace Company.BlazorTests1;
 #if (testFramework_xunit)
 public class CounterCSharpTests : TestContext
 #elif (testFramework_xunitv3)
+// The full qualified namespace for bUnit TestContext is used here as xunit v3 also offers a TestContext class
 public class CounterCSharpTests : Bunit.TestContext
 #elif (testFramework_nunit)
 public class CounterCSharpTests : BunitTestContext
diff --git a/src/bunit.template/template/CounterRazorTests.razor b/src/bunit.template/template/CounterRazorTests.razor
index f74a8a4a1..09f4ad12d 100644
--- a/src/bunit.template/template/CounterRazorTests.razor
+++ b/src/bunit.template/template/CounterRazorTests.razor
@@ -1,6 +1,7 @@
 @*#if (testFramework_xunit) *@
 @inherits TestContext
 @*#elif (testFramework_xunitv3)*@
+@* The full qualified namespace for bUnit TestContext is used here as xunit v3 also offers a TestContext class *@
 @inherits Bunit.TestContext
 @*#elif (testFramework_nunit)*@
 @inherits BunitTestContext