diff --git a/src/NServiceBus.AcceptanceTests/Timeouts/When_dispatched_timeout_already_removed_from_timeout_storage.cs b/src/NServiceBus.AcceptanceTests/Timeouts/When_dispatched_timeout_already_removed_from_timeout_storage.cs
index 0d7c1d2034..ac2ece64f8 100644
--- a/src/NServiceBus.AcceptanceTests/Timeouts/When_dispatched_timeout_already_removed_from_timeout_storage.cs
+++ b/src/NServiceBus.AcceptanceTests/Timeouts/When_dispatched_timeout_already_removed_from_timeout_storage.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Transactions;
     using NServiceBus.AcceptanceTesting;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NServiceBus.Config;
@@ -160,8 +161,14 @@ public TimeoutData Peek(string timeoutId)
                 public bool TryRemove(string timeoutId)
                 {
                     context.AttemptedToRemoveTimeout = true;
-                    // delete the timeout so it won't be available on retries
-                    originalTimeoutPersisterV2.TryRemove(timeoutId);
+
+                    using (var tx = new TransactionScope(TransactionScopeOption.Suppress))
+                    {
+                        // delete the timeout so it won't be available on retries
+                        originalTimeoutPersisterV2.TryRemove(timeoutId);
+                        tx.Complete();
+                    }
+
                     return false;
                 }
             }
diff --git a/src/NServiceBus.AcceptanceTests/Timeouts/When_endpoint_uses_outdated_sql_transport_with_disabled_dtc.cs b/src/NServiceBus.AcceptanceTests/Timeouts/When_endpoint_uses_outdated_sql_transport_with_disabled_dtc.cs
index 5e60c7e596..8f8451123f 100644
--- a/src/NServiceBus.AcceptanceTests/Timeouts/When_endpoint_uses_outdated_sql_transport_with_disabled_dtc.cs
+++ b/src/NServiceBus.AcceptanceTests/Timeouts/When_endpoint_uses_outdated_sql_transport_with_disabled_dtc.cs
@@ -23,7 +23,7 @@ public void Endpoint_should_not_start_and_show_warning()
                     .InnerException as ScenarioException;
 
             Assert.IsFalse(context.EndpointsStarted);
-            StringAssert.Contains("You are using an outdated transport which can lead to message loss!", scenarioException.Message);
+            StringAssert.Contains("You are using an outdated transport which can lead to message loss!", scenarioException.InnerException.Message);
         }
 
         [Test]
diff --git a/src/NServiceBus.AcceptanceTests/Timeouts/When_endpoint_uses_outdated_timeout_persistence_with_disabled_dtc.cs b/src/NServiceBus.AcceptanceTests/Timeouts/When_endpoint_uses_outdated_timeout_persistence_with_disabled_dtc.cs
index 1449571de7..15430e4dc5 100644
--- a/src/NServiceBus.AcceptanceTests/Timeouts/When_endpoint_uses_outdated_timeout_persistence_with_disabled_dtc.cs
+++ b/src/NServiceBus.AcceptanceTests/Timeouts/When_endpoint_uses_outdated_timeout_persistence_with_disabled_dtc.cs
@@ -21,7 +21,7 @@ public void Endpoint_should_not_start_and_show_warning()
                 .InnerException as ScenarioException;
 
             Assert.IsFalse(context.EndpointsStarted);
-            StringAssert.Contains("You are using an outdated timeout persistence which can lead to message loss!", scenarioException.Message);
+            StringAssert.Contains("You are using an outdated timeout persistence which can lead to message loss!", scenarioException.InnerException.Message);
         }
 
         [Test]
diff --git a/src/NServiceBus.AcceptanceTests/Timeouts/When_endpoint_uses_outdated_timeout_persistence_without_dtc.cs b/src/NServiceBus.AcceptanceTests/Timeouts/When_endpoint_uses_outdated_timeout_persistence_without_dtc.cs
index 8fddcb7b64..219736b63f 100644
--- a/src/NServiceBus.AcceptanceTests/Timeouts/When_endpoint_uses_outdated_timeout_persistence_without_dtc.cs
+++ b/src/NServiceBus.AcceptanceTests/Timeouts/When_endpoint_uses_outdated_timeout_persistence_without_dtc.cs
@@ -22,7 +22,7 @@ public void Endpoint_should_not_start_and_show_warning()
                     .InnerException as ScenarioException;
 
             Assert.IsFalse(context.EndpointsStarted);
-            StringAssert.Contains("You are using an outdated timeout persistence which can lead to message loss!", scenarioException.Message);
+            StringAssert.Contains("You are using an outdated timeout persistence which can lead to message loss!", scenarioException.InnerException.Message);
         }
 
         public class Endpoint : EndpointConfigurationBuilder