From f4675efaaf2f0aac4601899005c0266a6073292b Mon Sep 17 00:00:00 2001
From: Mark Ridgwell <credfeto@users.noreply.github.com>
Date: Mon, 22 Jun 2026 20:55:30 +0000
Subject: [PATCH 1/2] [Dependencies] Updating FunFair.Test.Common (Test
 Infrastructure) to 6.3.1.2342

---
 CHANGELOG.md                                                    | 2 +-
 .../BuildBot.CloudFormation.Tests.csproj                        | 2 +-
 src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj        | 2 +-
 src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj          | 2 +-
 src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj          | 2 +-
 src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj              | 2 +-
 .../BuildBot.ServiceModel.Tests.csproj                          | 2 +-
 src/BuildBot.Tests/BuildBot.Tests.csproj                        | 2 +-
 src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c7d870a..8710bc81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,7 +41,6 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
 - Dependencies - Updated xunit.analyzers to 1.27.0
 - Dependencies - Updated xunit.v3 to 3.2.2
 - Dependencies - Updated Serilog to 4.3.1
-- Dependencies - Updated FunFair.Test.Common to 6.2.17.1982
 - Dependencies - Updated Credfeto.Docker.HealthCheck.Http.Client to 0.0.61.659
 - Dependencies - Updated Figgle to 0.6.6
 - Dependencies - Updated FunFair.CodeAnalysis to 7.1.35.1745
@@ -61,6 +60,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
 - Dependencies - Updated Credfeto.Version.Information.Generator to 1.0.131.1336
 - Dependencies - Updated Microsoft.NET.Test.Sdk to 18.7.0
 - Dependencies - Updated Meziantou.Analyzer to 3.0.109
+- Dependencies - Updated FunFair.Test.Common to 6.3.1.2342
 ### Removed
 ### Deployment Changes
 <!--
diff --git a/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj b/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj
index 55d5cec1..90766d9b 100644
--- a/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj
+++ b/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj
@@ -44,7 +44,7 @@
     <ProjectReference Include="..\BuildBot.CloudFormation\BuildBot.CloudFormation.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FunFair.Test.Common" Version="6.2.25.2243" />
+    <PackageReference Include="FunFair.Test.Common" Version="6.3.1.2342" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
   </ItemGroup>
diff --git a/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj b/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj
index 4589ba01..23150169 100644
--- a/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj
+++ b/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj
@@ -44,7 +44,7 @@
     <ProjectReference Include="..\BuildBot.Discord\BuildBot.Discord.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FunFair.Test.Common" Version="6.2.25.2243" />
+    <PackageReference Include="FunFair.Test.Common" Version="6.3.1.2342" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
diff --git a/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj b/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj
index 2674615c..17ca52e6 100644
--- a/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj
+++ b/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj
@@ -45,7 +45,7 @@
     <ProjectReference Include="..\BuildBot.GitHub\BuildBot.GitHub.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FunFair.Test.Common" Version="6.2.25.2243" />
+    <PackageReference Include="FunFair.Test.Common" Version="6.3.1.2342" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
diff --git a/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj b/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj
index a7b24204..943b1fda 100644
--- a/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj
+++ b/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj
@@ -44,7 +44,7 @@
     <ProjectReference Include="..\BuildBot.Health\BuildBot.Health.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FunFair.Test.Common" Version="6.2.25.2243" />
+    <PackageReference Include="FunFair.Test.Common" Version="6.3.1.2342" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
   </ItemGroup>
diff --git a/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj b/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj
index d96a6a6e..f468d146 100644
--- a/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj
+++ b/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj
@@ -44,7 +44,7 @@
     <ProjectReference Include="..\BuildBot.Json\BuildBot.Json.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FunFair.Test.Common" Version="6.2.25.2243" />
+    <PackageReference Include="FunFair.Test.Common" Version="6.3.1.2342" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
   </ItemGroup>
diff --git a/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj b/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj
index be51ba1e..27b1fc8e 100644
--- a/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj
+++ b/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj
@@ -44,7 +44,7 @@
     <ProjectReference Include="..\BuildBot.ServiceModel\BuildBot.ServiceModel.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FunFair.Test.Common" Version="6.2.25.2243" />
+    <PackageReference Include="FunFair.Test.Common" Version="6.3.1.2342" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
   </ItemGroup>
diff --git a/src/BuildBot.Tests/BuildBot.Tests.csproj b/src/BuildBot.Tests/BuildBot.Tests.csproj
index 8a358c2e..e37ba265 100644
--- a/src/BuildBot.Tests/BuildBot.Tests.csproj
+++ b/src/BuildBot.Tests/BuildBot.Tests.csproj
@@ -44,7 +44,7 @@
     <ProjectReference Include="..\BuildBot.Json\BuildBot.Json.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FunFair.Test.Common" Version="6.2.25.2243" />
+    <PackageReference Include="FunFair.Test.Common" Version="6.3.1.2342" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
diff --git a/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj b/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj
index 4312e3e9..ecd4ab63 100644
--- a/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj
+++ b/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj
@@ -44,7 +44,7 @@
     <ProjectReference Include="..\BuildBot.Watchtower\BuildBot.Watchtower.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FunFair.Test.Common" Version="6.2.25.2243" />
+    <PackageReference Include="FunFair.Test.Common" Version="6.3.1.2342" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
   </ItemGroup>

From f8d814f434256d5d03248ee9bb481ec3de8bf3c8 Mon Sep 17 00:00:00 2001
From: Mark Ridgwell <273118822+dnyw4l3n13@users.noreply.github.com>
Date: Tue, 23 Jun 2026 12:17:48 +0000
Subject: [PATCH 2/2] fix: update test projects to use
 FunFair.Test.Infrastructure for MockDateTimeSources and AddMockedService

MockDateTimeSources and AddMockedService moved from FunFair.Test.Common to
FunFair.Test.Infrastructure in version 6.3.x. Add the FunFair.Test.Infrastructure
package reference to affected test projects and update using directives accordingly.

Prompt: Work on pull request #382 in funfair-tech/BuildBot.
---
 .../BuildBot.CloudFormation.Tests.csproj                       | 3 ++-
 .../CloudFormationMessageReceivedNotificationHandlerTests.cs   | 2 +-
 .../Services/CloudFormationDeploymentExtractorTests.cs         | 2 +-
 src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj         | 3 ++-
 src/BuildBot.GitHub.Tests/DependencyInjectionTests.cs          | 1 +
 .../Publishers/GithubPushNotificationHandlerTests.cs           | 2 +-
 .../Publishers/GithubStatusNotificationHandlerTests.cs         | 2 +-
 .../BuildBot.ServiceModel.Tests.csproj                         | 3 ++-
 .../CloudFormation/SnsMessageTests.cs                          | 2 +-
 src/BuildBot.ServiceModel.Tests/GitHub/CommitTests.cs          | 2 +-
 src/BuildBot.ServiceModel.Tests/GitHub/PushTests.cs            | 2 +-
 src/BuildBot.ServiceModel.Tests/GitHub/StatusCommitTests.cs    | 2 +-
 src/BuildBot.ServiceModel.Tests/GitHub/StatusTests.cs          | 2 +-
 src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj | 3 ++-
 src/BuildBot.Watchtower.Tests/DependencyInjectionTests.cs      | 1 +
 15 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj b/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj
index 90766d9b..eb45892c 100644
--- a/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj
+++ b/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj
@@ -45,6 +45,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FunFair.Test.Common" Version="6.3.1.2342" />
+    <PackageReference Include="FunFair.Test.Infrastructure" Version="6.3.1.2342" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
   </ItemGroup>
@@ -69,4 +70,4 @@
     <PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
     <PackageReference Include="xunit.analyzers" Version="1.27.0" PrivateAssets="All" ExcludeAssets="runtime" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/BuildBot.CloudFormation.Tests/Publishers/CloudFormationMessageReceivedNotificationHandlerTests.cs b/src/BuildBot.CloudFormation.Tests/Publishers/CloudFormationMessageReceivedNotificationHandlerTests.cs
index 8dd25eb0..bdbc72eb 100644
--- a/src/BuildBot.CloudFormation.Tests/Publishers/CloudFormationMessageReceivedNotificationHandlerTests.cs
+++ b/src/BuildBot.CloudFormation.Tests/Publishers/CloudFormationMessageReceivedNotificationHandlerTests.cs
@@ -8,7 +8,7 @@
 using BuildBot.CloudFormation.Publishers;
 using BuildBot.Discord.Models;
 using FunFair.Test.Common;
-using FunFair.Test.Common.Mocks;
+using FunFair.Test.Infrastructure.Mocks;
 using Mediator;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
diff --git a/src/BuildBot.CloudFormation.Tests/Services/CloudFormationDeploymentExtractorTests.cs b/src/BuildBot.CloudFormation.Tests/Services/CloudFormationDeploymentExtractorTests.cs
index 043988a2..7181dcf5 100644
--- a/src/BuildBot.CloudFormation.Tests/Services/CloudFormationDeploymentExtractorTests.cs
+++ b/src/BuildBot.CloudFormation.Tests/Services/CloudFormationDeploymentExtractorTests.cs
@@ -4,7 +4,7 @@
 using BuildBot.CloudFormation.Models;
 using BuildBot.CloudFormation.Services;
 using FunFair.Test.Common;
-using FunFair.Test.Common.Mocks;
+using FunFair.Test.Infrastructure.Mocks;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
 using Xunit;
diff --git a/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj b/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj
index 17ca52e6..fe84b28c 100644
--- a/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj
+++ b/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj
@@ -46,6 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FunFair.Test.Common" Version="6.3.1.2342" />
+    <PackageReference Include="FunFair.Test.Infrastructure" Version="6.3.1.2342" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
@@ -71,4 +72,4 @@
     <PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
     <PackageReference Include="xunit.analyzers" Version="1.27.0" PrivateAssets="All" ExcludeAssets="runtime" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/BuildBot.GitHub.Tests/DependencyInjectionTests.cs b/src/BuildBot.GitHub.Tests/DependencyInjectionTests.cs
index 9c908800..586826f4 100644
--- a/src/BuildBot.GitHub.Tests/DependencyInjectionTests.cs
+++ b/src/BuildBot.GitHub.Tests/DependencyInjectionTests.cs
@@ -1,5 +1,6 @@
 using BuildBot.GitHub.Publishers;
 using FunFair.Test.Common;
+using FunFair.Test.Infrastructure;
 using Mediator;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
diff --git a/src/BuildBot.GitHub.Tests/Publishers/GithubPushNotificationHandlerTests.cs b/src/BuildBot.GitHub.Tests/Publishers/GithubPushNotificationHandlerTests.cs
index 0712b8af..2a269e8c 100644
--- a/src/BuildBot.GitHub.Tests/Publishers/GithubPushNotificationHandlerTests.cs
+++ b/src/BuildBot.GitHub.Tests/Publishers/GithubPushNotificationHandlerTests.cs
@@ -21,7 +21,7 @@ public sealed class GithubPushNotificationHandlerTests : TestBase
     private const string TEAMCITY_REPO = "TeamCity";
     private const string NORMAL_REPO = "BuildBot";
     private static readonly DateTime COMMIT_TIMESTAMP = FunFair
-        .Test.Common.Mocks.MockDateTimeSources.Past.GetUtcNow()
+        .Test.Infrastructure.Mocks.MockDateTimeSources.Past.GetUtcNow()
         .UtcDateTime;
 
     private static Commit MakeCommit(string message, string? username = "testuser")
diff --git a/src/BuildBot.GitHub.Tests/Publishers/GithubStatusNotificationHandlerTests.cs b/src/BuildBot.GitHub.Tests/Publishers/GithubStatusNotificationHandlerTests.cs
index 32960059..4e6d3ea4 100644
--- a/src/BuildBot.GitHub.Tests/Publishers/GithubStatusNotificationHandlerTests.cs
+++ b/src/BuildBot.GitHub.Tests/Publishers/GithubStatusNotificationHandlerTests.cs
@@ -15,7 +15,7 @@ namespace BuildBot.GitHub.Tests.Publishers;
 public sealed class GithubStatusNotificationHandlerTests : TestBase
 {
     private static readonly DateTime COMMIT_TIMESTAMP = FunFair
-        .Test.Common.Mocks.MockDateTimeSources.Past.GetUtcNow()
+        .Test.Infrastructure.Mocks.MockDateTimeSources.Past.GetUtcNow()
         .UtcDateTime;
 
     private static Status MakeStatus(string state)
diff --git a/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj b/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj
index 27b1fc8e..46795633 100644
--- a/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj
+++ b/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj
@@ -45,6 +45,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FunFair.Test.Common" Version="6.3.1.2342" />
+    <PackageReference Include="FunFair.Test.Infrastructure" Version="6.3.1.2342" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
   </ItemGroup>
@@ -69,4 +70,4 @@
     <PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
     <PackageReference Include="xunit.analyzers" Version="1.27.0" PrivateAssets="All" ExcludeAssets="runtime" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/BuildBot.ServiceModel.Tests/CloudFormation/SnsMessageTests.cs b/src/BuildBot.ServiceModel.Tests/CloudFormation/SnsMessageTests.cs
index dc9a41ed..53b4a5fa 100644
--- a/src/BuildBot.ServiceModel.Tests/CloudFormation/SnsMessageTests.cs
+++ b/src/BuildBot.ServiceModel.Tests/CloudFormation/SnsMessageTests.cs
@@ -1,7 +1,7 @@
 using System;
 using BuildBot.ServiceModel.CloudFormation;
 using FunFair.Test.Common;
-using FunFair.Test.Common.Mocks;
+using FunFair.Test.Infrastructure.Mocks;
 using Xunit;
 
 namespace BuildBot.ServiceModel.Tests.CloudFormation;
diff --git a/src/BuildBot.ServiceModel.Tests/GitHub/CommitTests.cs b/src/BuildBot.ServiceModel.Tests/GitHub/CommitTests.cs
index 674a8e28..be45b621 100644
--- a/src/BuildBot.ServiceModel.Tests/GitHub/CommitTests.cs
+++ b/src/BuildBot.ServiceModel.Tests/GitHub/CommitTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using BuildBot.ServiceModel.GitHub;
 using FunFair.Test.Common;
-using FunFair.Test.Common.Mocks;
+using FunFair.Test.Infrastructure.Mocks;
 using Xunit;
 
 namespace BuildBot.ServiceModel.Tests.GitHub;
diff --git a/src/BuildBot.ServiceModel.Tests/GitHub/PushTests.cs b/src/BuildBot.ServiceModel.Tests/GitHub/PushTests.cs
index 256925ac..ed0ef2b5 100644
--- a/src/BuildBot.ServiceModel.Tests/GitHub/PushTests.cs
+++ b/src/BuildBot.ServiceModel.Tests/GitHub/PushTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using BuildBot.ServiceModel.GitHub;
 using FunFair.Test.Common;
-using FunFair.Test.Common.Mocks;
+using FunFair.Test.Infrastructure.Mocks;
 using Xunit;
 
 namespace BuildBot.ServiceModel.Tests.GitHub;
diff --git a/src/BuildBot.ServiceModel.Tests/GitHub/StatusCommitTests.cs b/src/BuildBot.ServiceModel.Tests/GitHub/StatusCommitTests.cs
index cbafcc0f..32a98a49 100644
--- a/src/BuildBot.ServiceModel.Tests/GitHub/StatusCommitTests.cs
+++ b/src/BuildBot.ServiceModel.Tests/GitHub/StatusCommitTests.cs
@@ -1,7 +1,7 @@
 using System;
 using BuildBot.ServiceModel.GitHub;
 using FunFair.Test.Common;
-using FunFair.Test.Common.Mocks;
+using FunFair.Test.Infrastructure.Mocks;
 using Xunit;
 
 namespace BuildBot.ServiceModel.Tests.GitHub;
diff --git a/src/BuildBot.ServiceModel.Tests/GitHub/StatusTests.cs b/src/BuildBot.ServiceModel.Tests/GitHub/StatusTests.cs
index 125af09c..1b36c34a 100644
--- a/src/BuildBot.ServiceModel.Tests/GitHub/StatusTests.cs
+++ b/src/BuildBot.ServiceModel.Tests/GitHub/StatusTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using BuildBot.ServiceModel.GitHub;
 using FunFair.Test.Common;
-using FunFair.Test.Common.Mocks;
+using FunFair.Test.Infrastructure.Mocks;
 using Xunit;
 
 namespace BuildBot.ServiceModel.Tests.GitHub;
diff --git a/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj b/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj
index ecd4ab63..60ee9b04 100644
--- a/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj
+++ b/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj
@@ -45,6 +45,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FunFair.Test.Common" Version="6.3.1.2342" />
+    <PackageReference Include="FunFair.Test.Infrastructure" Version="6.3.1.2342" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
   </ItemGroup>
@@ -69,4 +70,4 @@
     <PackageReference Include="ToStringWithoutOverrideAnalyzer" Version="0.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
     <PackageReference Include="xunit.analyzers" Version="1.27.0" PrivateAssets="All" ExcludeAssets="runtime" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/BuildBot.Watchtower.Tests/DependencyInjectionTests.cs b/src/BuildBot.Watchtower.Tests/DependencyInjectionTests.cs
index c3b2128d..06263e67 100644
--- a/src/BuildBot.Watchtower.Tests/DependencyInjectionTests.cs
+++ b/src/BuildBot.Watchtower.Tests/DependencyInjectionTests.cs
@@ -1,5 +1,6 @@
 using BuildBot.Watchtower.Publishers;
 using FunFair.Test.Common;
+using FunFair.Test.Infrastructure;
 using Mediator;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;