diff --git a/src/Yavsc.Org.Tests/ComputeKidTests.cs b/src/Yavsc.Org.Tests/ComputeKidTests.cs
index b1338bbd4..61aa5260f 100644
--- a/src/Yavsc.Org.Tests/ComputeKidTests.cs
+++ b/src/Yavsc.Org.Tests/ComputeKidTests.cs
@@ -1,5 +1,6 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
+using Xunit;
 using Yavsc.Extensions;
 
 namespace Yavsc.Org.Tests;
diff --git a/src/Yavsc.Org.Tests/Controllers/ClientControllerCollectionTests.cs b/src/Yavsc.Org.Tests/Controllers/ClientControllerCollectionTests.cs
index d2e40f53c..264eff64d 100644
--- a/src/Yavsc.Org.Tests/Controllers/ClientControllerCollectionTests.cs
+++ b/src/Yavsc.Org.Tests/Controllers/ClientControllerCollectionTests.cs
@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Yavsc.Models;
 using Yavsc.Tests.Shared;
+using Xunit;
 
 namespace Yavsc.Org.Tests.Controllers;
 
diff --git a/src/Yavsc.Org.Tests/Controllers/CommandFormsControllerTests.cs b/src/Yavsc.Org.Tests/Controllers/CommandFormsControllerTests.cs
index 462d6fca2..621663285 100644
--- a/src/Yavsc.Org.Tests/Controllers/CommandFormsControllerTests.cs
+++ b/src/Yavsc.Org.Tests/Controllers/CommandFormsControllerTests.cs
@@ -1,6 +1,7 @@
 using System.Net;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Yavsc.Tests.Shared;
+using Xunit;
 
 namespace Yavsc.Org.Tests.Controllers;
 
diff --git a/src/Yavsc.Org.Tests/Controllers/CommentsApiIntegrationTests.cs b/src/Yavsc.Org.Tests/Controllers/CommentsApiIntegrationTests.cs
index 4b145cd70..39d649311 100644
--- a/src/Yavsc.Org.Tests/Controllers/CommentsApiIntegrationTests.cs
+++ b/src/Yavsc.Org.Tests/Controllers/CommentsApiIntegrationTests.cs
@@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Yavsc.Models;
 using Yavsc.Models.Blog;
 using Yavsc.Tests.Shared;
+using Xunit;
 
 namespace Yavsc.Org.Tests.Controllers;
 
diff --git a/src/Yavsc.Org.Tests/Controllers/CommentsControllerTests.cs b/src/Yavsc.Org.Tests/Controllers/CommentsControllerTests.cs
index 28213effe..0954cdd27 100644
--- a/src/Yavsc.Org.Tests/Controllers/CommentsControllerTests.cs
+++ b/src/Yavsc.Org.Tests/Controllers/CommentsControllerTests.cs
@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Controllers;
 using Yavsc.Models;
 using Yavsc.Models.Blog;
+using Xunit;
 
 namespace Yavsc.Org.Tests.Controllers;
 
diff --git a/src/Yavsc.Org.Tests/Controllers/TestWebApplicationFactoryIsolationTests.cs b/src/Yavsc.Org.Tests/Controllers/TestWebApplicationFactoryIsolationTests.cs
index 491a0c6e0..f1507bf49 100644
--- a/src/Yavsc.Org.Tests/Controllers/TestWebApplicationFactoryIsolationTests.cs
+++ b/src/Yavsc.Org.Tests/Controllers/TestWebApplicationFactoryIsolationTests.cs
@@ -3,6 +3,7 @@ using IdentityServer8.EntityFramework.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Xunit;
 
 namespace Yavsc.Org.Tests.Controllers;
 
diff --git a/src/Yavsc.Org.Tests/DictionnaireMetierTests.cs b/src/Yavsc.Org.Tests/DictionnaireMetierTests.cs
index a05b24e88..2bb99b072 100644
--- a/src/Yavsc.Org.Tests/DictionnaireMetierTests.cs
+++ b/src/Yavsc.Org.Tests/DictionnaireMetierTests.cs
@@ -2,6 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Models;
 using Yavsc.Models.Workflow;
 using Yavsc.Server.Services;
+using Xunit;
 
 namespace Yavsc.Org.Tests;
 
diff --git a/src/Yavsc.Org.Tests/DumpHtml.cs b/src/Yavsc.Org.Tests/DumpHtml.cs
index 8caf3c3ee..2a6b4ce66 100644
--- a/src/Yavsc.Org.Tests/DumpHtml.cs
+++ b/src/Yavsc.Org.Tests/DumpHtml.cs
@@ -1,5 +1,7 @@
 
 
+using Xunit;
+
 namespace Yavsc.Org.Tests
 {
     [Collection("Yavsc Server")]
diff --git a/src/Yavsc.Org.Tests/EstimateSignatureFileHelperTests.cs b/src/Yavsc.Org.Tests/EstimateSignatureFileHelperTests.cs
index 69009432e..91a4e1532 100644
--- a/src/Yavsc.Org.Tests/EstimateSignatureFileHelperTests.cs
+++ b/src/Yavsc.Org.Tests/EstimateSignatureFileHelperTests.cs
@@ -1,5 +1,6 @@
 using System.Security.Claims;
 using System.Text.Json;
+using Xunit;
 using Yavsc.Models.Billing;
 using Yavsc.Server.Helpers;
 using Yavsc.Server.Models.FileSystem;
diff --git a/src/Yavsc.Org.Tests/Mandatory/BatchTests.cs b/src/Yavsc.Org.Tests/Mandatory/BatchTests.cs
index 30f0535a9..33065e013 100644
--- a/src/Yavsc.Org.Tests/Mandatory/BatchTests.cs
+++ b/src/Yavsc.Org.Tests/Mandatory/BatchTests.cs
@@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Yavsc.Models;
 using Yavsc.Server.Models.IT.SourceCode;
 using Microsoft.EntityFrameworkCore;
-
+using Xunit;
 using Yavsc.Server.Models.IT;
 
 namespace Yavsc.Org.Tests
diff --git a/src/Yavsc.Org.Tests/Mandatory/Remoting.cs b/src/Yavsc.Org.Tests/Mandatory/Remoting.cs
index bb9353cb4..7def1a43f 100644
--- a/src/Yavsc.Org.Tests/Mandatory/Remoting.cs
+++ b/src/Yavsc.Org.Tests/Mandatory/Remoting.cs
@@ -1,6 +1,7 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Net.Security;
 using IdentityModel.Client;
+using Xunit;
 
 namespace Yavsc.Org.Tests
 {
diff --git a/src/Yavsc.Org.Tests/Mandatory/Services.cs b/src/Yavsc.Org.Tests/Mandatory/Services.cs
index fa9e60877..8dc0aad36 100644
--- a/src/Yavsc.Org.Tests/Mandatory/Services.cs
+++ b/src/Yavsc.Org.Tests/Mandatory/Services.cs
@@ -1,4 +1,5 @@
 namespace Yavsc.Org.Tests.Mandatory;
+using Xunit;
 
 [Collection("Yavsc Server")]
 [Trait("regression", "oui")]
diff --git a/src/Yavsc.Org.Tests/NonRegression/AbstractTests.cs b/src/Yavsc.Org.Tests/NonRegression/AbstractTests.cs
index b85ae3cbd..398542375 100644
--- a/src/Yavsc.Org.Tests/NonRegression/AbstractTests.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/AbstractTests.cs
@@ -1,5 +1,6 @@
 
 using Yavsc.Server.Helpers;
+using Xunit;
 
 namespace Yavsc
 {
diff --git a/src/Yavsc.Org.Tests/NonRegression/ApplicationUserDisplayTemplateTests.cs b/src/Yavsc.Org.Tests/NonRegression/ApplicationUserDisplayTemplateTests.cs
index e0f8e9bfd..553d73e83 100644
--- a/src/Yavsc.Org.Tests/NonRegression/ApplicationUserDisplayTemplateTests.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/ApplicationUserDisplayTemplateTests.cs
@@ -1,4 +1,5 @@
 namespace Yavsc.Org.Tests.NonRegression;
+using Xunit;
 
 /// <summary>
 /// Régression du 500 sur <c>GET /BlogSpot/Details/{id}</c> (auteur
diff --git a/src/Yavsc.Org.Tests/NonRegression/AvatarFallbackTests.cs b/src/Yavsc.Org.Tests/NonRegression/AvatarFallbackTests.cs
index 200f37fad..7513e43e6 100644
--- a/src/Yavsc.Org.Tests/NonRegression/AvatarFallbackTests.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/AvatarFallbackTests.cs
@@ -1,4 +1,5 @@
 namespace Yavsc.Org.Tests.NonRegression;
+using Xunit;
 
 /// <summary>
 /// Non-regression: avatar requests under /avatars must never return 404
diff --git a/src/Yavsc.Org.Tests/NonRegression/BillingServiceTests.cs b/src/Yavsc.Org.Tests/NonRegression/BillingServiceTests.cs
index 261308a23..4e8ae0d6f 100644
--- a/src/Yavsc.Org.Tests/NonRegression/BillingServiceTests.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/BillingServiceTests.cs
@@ -4,6 +4,7 @@ using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Haircut;
 using Yavsc.Services;
+using Xunit;
 
 namespace Yavsc
 {
diff --git a/src/Yavsc.Org.Tests/NonRegression/Database.cs b/src/Yavsc.Org.Tests/NonRegression/Database.cs
index 1baf7e3bc..d079ec51c 100644
--- a/src/Yavsc.Org.Tests/NonRegression/Database.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/Database.cs
@@ -1,5 +1,8 @@
 namespace Yavsc.Org.Tests.Mandatory
-{[Collection("Database")]
+{
+    using Xunit;
+
+    [Collection("Database")]
     [Trait("regression", "II")]
     [Trait("dev", "wip")]
     public class Database : IClassFixture<WebServerFixture>
diff --git a/src/Yavsc.Org.Tests/NonRegression/EMailling.cs b/src/Yavsc.Org.Tests/NonRegression/EMailling.cs
index fd1fe5013..eed2e9e18 100644
--- a/src/Yavsc.Org.Tests/NonRegression/EMailling.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/EMailling.cs
@@ -14,10 +14,12 @@ using Yavsc.Org.Tests.Fakes;
 using Yavsc.Services;
 using Yavsc.Settings;
 using Yavsc.ViewModels.Account;
+using Xunit;
 
 namespace Yavsc.Org.Tests
 {
 
+
     [Collection("EMaillingTeststCollection")]
     [Trait("regression", "II")]
     public class EMaillingTests : IClassFixture<WebServerFixture>
diff --git a/src/Yavsc.Org.Tests/NonRegression/FileServerUrlHelpersTests.cs b/src/Yavsc.Org.Tests/NonRegression/FileServerUrlHelpersTests.cs
index ffba577d6..88224b577 100644
--- a/src/Yavsc.Org.Tests/NonRegression/FileServerUrlHelpersTests.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/FileServerUrlHelpersTests.cs
@@ -1,6 +1,7 @@
 using Yavsc.Abstract.Files;
 
 namespace Yavsc.Org.Tests.NonRegression;
+using Xunit;
 
 public class FileServerUrlHelpersTests
 {
diff --git a/src/Yavsc.Org.Tests/NonRegression/OidcSeedTests.cs b/src/Yavsc.Org.Tests/NonRegression/OidcSeedTests.cs
index 5bf46a30f..af449ae71 100644
--- a/src/Yavsc.Org.Tests/NonRegression/OidcSeedTests.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/OidcSeedTests.cs
@@ -1,3 +1,5 @@
+using Xunit;
+
 namespace Yavsc
 {
     /// <summary>
diff --git a/src/Yavsc.Org.Tests/NonRegression/PerformerCodeInputValidationTests.cs b/src/Yavsc.Org.Tests/NonRegression/PerformerCodeInputValidationTests.cs
index c47bdff5a..9d418404a 100644
--- a/src/Yavsc.Org.Tests/NonRegression/PerformerCodeInputValidationTests.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/PerformerCodeInputValidationTests.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Yavsc.Models.Relationship;
 using Yavsc.Models.Workflow;
+using Xunit;
 
 namespace Yavsc.Tests.NonRegression;
 
@@ -73,4 +74,4 @@ public class PerformerCodeInputValidationTests
         Validator.TryValidateObject(profile, ctx, results, validateAllProperties: true);
         return results;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Yavsc.Org.Tests/NonRegression/SetActivityCountryValidationViewTests.cs b/src/Yavsc.Org.Tests/NonRegression/SetActivityCountryValidationViewTests.cs
index 23ace4589..73e9d8f0a 100644
--- a/src/Yavsc.Org.Tests/NonRegression/SetActivityCountryValidationViewTests.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/SetActivityCountryValidationViewTests.cs
@@ -1,3 +1,4 @@
+using Xunit;
 namespace Yavsc.Org.Tests.NonRegression;
 
 /// <summary>
diff --git a/src/Yavsc.Org.Tests/NonRegression/UserDisplayHelpersTests.cs b/src/Yavsc.Org.Tests/NonRegression/UserDisplayHelpersTests.cs
index c7c46db90..c20270cc8 100644
--- a/src/Yavsc.Org.Tests/NonRegression/UserDisplayHelpersTests.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/UserDisplayHelpersTests.cs
@@ -1,4 +1,5 @@
 using Yavsc.Abstract.Identity;
+using Xunit;
 
 namespace Yavsc.Org.Tests.NonRegression;
 
diff --git a/src/Yavsc.Org.Tests/Services/FileSystemAuthManagerTests.cs b/src/Yavsc.Org.Tests/Services/FileSystemAuthManagerTests.cs
index 8a796e4b5..ff532390f 100644
--- a/src/Yavsc.Org.Tests/Services/FileSystemAuthManagerTests.cs
+++ b/src/Yavsc.Org.Tests/Services/FileSystemAuthManagerTests.cs
@@ -2,9 +2,9 @@ using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 using Yavsc.Models;
-using Yavsc.Models.Access;
 using Yavsc.Models.Relationship;
 using Yavsc.Services;
+using Xunit;
 
 namespace Yavsc.Org.Tests.Services;
 
diff --git a/src/Yavsc.Org.Tests/Smoke/AccountSmokeTests.cs b/src/Yavsc.Org.Tests/Smoke/AccountSmokeTests.cs
index 9b24582a3..61d774c57 100644
--- a/src/Yavsc.Org.Tests/Smoke/AccountSmokeTests.cs
+++ b/src/Yavsc.Org.Tests/Smoke/AccountSmokeTests.cs
@@ -1,5 +1,6 @@
 using IdentityServer8.Stores;
 using Microsoft.Extensions.DependencyInjection;
+using Xunit;
 
 namespace Yavsc.Org.Tests.Smoke;
 
diff --git a/src/Yavsc.Org.Tests/Smoke/BlogSmokeTests.cs b/src/Yavsc.Org.Tests/Smoke/BlogSmokeTests.cs
index 3c383ad80..e1aedcf0e 100644
--- a/src/Yavsc.Org.Tests/Smoke/BlogSmokeTests.cs
+++ b/src/Yavsc.Org.Tests/Smoke/BlogSmokeTests.cs
@@ -1,3 +1,5 @@
+using Xunit;
+
 namespace Yavsc.Org.Tests.Smoke;
 
 /// <summary>
diff --git a/src/Yavsc.Org.Tests/StaticAssetsPathsTests.cs b/src/Yavsc.Org.Tests/StaticAssetsPathsTests.cs
index fcc22e1c9..d8cbd9b35 100644
--- a/src/Yavsc.Org.Tests/StaticAssetsPathsTests.cs
+++ b/src/Yavsc.Org.Tests/StaticAssetsPathsTests.cs
@@ -1,4 +1,6 @@
 namespace Yavsc.Org.Tests;
+using Xunit;
+
 
 /// <summary>
 /// Diagnostic-only test that confirms the static-assets manifests
diff --git a/src/Yavsc.Org.Tests/WebServerFixture.cs b/src/Yavsc.Org.Tests/WebServerFixture.cs
index f438fd88c..5ca1daa06 100644
--- a/src/Yavsc.Org.Tests/WebServerFixture.cs
+++ b/src/Yavsc.Org.Tests/WebServerFixture.cs
@@ -17,6 +17,7 @@ using Yavsc.Server.Helpers;
 using Yavsc.Tests.Shared;
 using Client = IdentityServer8.EntityFramework.Entities.Client;
 using Yavsc.Org.Tests.Fakes;
+using Xunit;
 
 namespace Yavsc.Org.Tests;
 
diff --git a/src/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj b/src/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj
index 0d18d1e0f..58bafb8a0 100644
--- a/src/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj
+++ b/src/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj
@@ -48,13 +48,15 @@
     <ProjectReference Include="..\Yavsc.Server\Yavsc.Server.csproj" />
     <ProjectReference Include="..\Yavsc.Tests.Shared\Yavsc.Tests.Shared.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Using Include="Xunit" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
   </ItemGroup>
+  <ItemGroup>
+      <Content Update="xunit.runner.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+  </ItemGroup>
   <!--
     MapStaticAssets() in the production pipeline resolves
     {AssemblyName}.staticwebassets.endpoints.json from ContentRoot.