diff --git a/src/AcceptanceTests/GlobalUsings.cs b/src/AcceptanceTests/GlobalUsings.cs
new file mode 100644
index 00000000..4260cfcb
--- /dev/null
+++ b/src/AcceptanceTests/GlobalUsings.cs
@@ -0,0 +1,2 @@
+global using NServiceBus.AcceptanceTests;
+global using NServiceBus.AcceptanceTests.EndpointTemplates;
diff --git a/src/AcceptanceTests/Infrastructure/DefaultServer.cs b/src/AcceptanceTests/Infrastructure/DefaultServer.cs
deleted file mode 100644
index 5e1d852d..00000000
--- a/src/AcceptanceTests/Infrastructure/DefaultServer.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-namespace NServiceBus.Encryption.MessageProperty.AcceptanceTests
-{
-    using System;
-    using System.Threading.Tasks;
-    using AcceptanceTesting.Customization;
-    using AcceptanceTesting.Support;
-    using Configuration.AdvancedExtensibility;
-    using Microsoft.Extensions.DependencyInjection;
-
-    public class DefaultServer : IEndpointSetupTemplate
-    {
-        public async Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func<EndpointConfiguration, Task> configurationBuilderCustomization)
-        {
-            var configuration = new EndpointConfiguration(endpointConfiguration.EndpointName);
-            configuration.UseSerialization<SystemJsonSerializer>();
-
-            configuration.EnableInstallers();
-
-            var recoverability = configuration.Recoverability();
-            recoverability.Delayed(delayed => delayed.NumberOfRetries(0));
-            recoverability.Immediate(immediate => immediate.NumberOfRetries(0));
-
-            configuration.UseTransport(new LearningTransport());
-
-            configuration.RegisterComponents(r =>
-            {
-                var type = runDescriptor.ScenarioContext.GetType();
-                while (type != typeof(object))
-                {
-                    r.AddSingleton(type, runDescriptor.ScenarioContext);
-                    type = type.BaseType;
-                }
-            });
-
-            configuration.UsePersistence<AcceptanceTestingPersistence>();
-
-            configuration.GetSettings().SetDefault("ScaleOut.UseSingleBrokerQueue", true);
-            await configurationBuilderCustomization(configuration);
-
-            configuration.ScanTypesForTest(endpointConfiguration);
-
-            return configuration;
-        }
-    }
-}
diff --git a/src/AcceptanceTests/Infrastructure/NServiceBusAcceptanceTest.cs b/src/AcceptanceTests/Infrastructure/NServiceBusAcceptanceTest.cs
deleted file mode 100644
index 066ef1a6..00000000
--- a/src/AcceptanceTests/Infrastructure/NServiceBusAcceptanceTest.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace NServiceBus.Encryption.MessageProperty.AcceptanceTests
-{
-    using System.Linq;
-    using System.Threading;
-    using AcceptanceTesting.Customization;
-    using NUnit.Framework;
-
-    /// <summary>
-    /// Base class for all the NSB test that sets up our conventions
-    /// </summary>
-    [TestFixture]
-    public abstract partial class NServiceBusAcceptanceTest
-    {
-        [SetUp]
-        public void SetUp()
-        {
-            Conventions.EndpointNamingConvention = t =>
-            {
-                var classAndEndpoint = t.FullName.Split('.').Last();
-
-                var testName = classAndEndpoint.Split('+').First();
-
-                testName = testName.Replace("When_", "");
-
-                var endpointBuilder = classAndEndpoint.Split('+').Last();
-
-                testName = Thread.CurrentThread.CurrentCulture.TextInfo.ToTitleCase(testName);
-
-                testName = testName.Replace("_", "");
-
-                return testName + "." + endpointBuilder;
-            };
-        }
-    }
-}
diff --git a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj
index 0e72071e..3efb8ce7 100644
--- a/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj
+++ b/src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj
@@ -11,10 +11,22 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="3.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="10.1.4" />
     <PackageReference Include="NUnit" Version="4.6.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.13.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="10.1.4" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.1.4" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(PkgNServiceBus_AcceptanceTests_Sources)' != ''">
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\*.cs" />
+    <Compile Include="$(PkgNServiceBus_AcceptanceTests_Sources)\contentFiles\cs\$(TargetFramework)\**\EndpointTemplates\*.cs" />
+    <Compile Include="$(PkgNServiceBus_AcceptanceTests_Sources)\contentFiles\cs\$(TargetFramework)\**\ConfigureEndpointAcceptanceTestingTransport.cs" />
+    <Compile Include="$(PkgNServiceBus_AcceptanceTests_Sources)\contentFiles\cs\$(TargetFramework)\**\ConfigureEndpointAcceptanceTestingPersistence.cs" />
+    <Compile Include="$(PkgNServiceBus_AcceptanceTests_Sources)\contentFiles\cs\$(TargetFramework)\**\NServiceBusAcceptanceTest.cs" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/AcceptanceTests/TestSuiteConstraints.cs b/src/AcceptanceTests/TestSuiteConstraints.cs
new file mode 100644
index 00000000..3e1823f5
--- /dev/null
+++ b/src/AcceptanceTests/TestSuiteConstraints.cs
@@ -0,0 +1,24 @@
+namespace NServiceBus.AcceptanceTests;
+
+using AcceptanceTesting.Support;
+
+public partial class TestSuiteConstraints
+{
+    public bool SupportsDtc => false;
+
+    public bool SupportsCrossQueueTransactions => true;
+
+    public bool SupportsNativePubSub => true;
+
+    public bool SupportsDelayedDelivery => true;
+
+    public bool SupportsOutbox => false;
+
+    public bool SupportsPurgeOnStartup => true;
+
+    public IConfigureEndpointTestExecution CreateTransportConfiguration() =>
+        new ConfigureEndpointAcceptanceTestingTransport(SupportsNativePubSub, SupportsDelayedDelivery);
+
+    public IConfigureEndpointTestExecution CreatePersistenceConfiguration() =>
+        new ConfigureEndpointAcceptanceTestingPersistence();
+}