diff --git a/test/Core.Test/AutoFixture/FeatureServiceFixtures.cs b/test/Core.Test/AutoFixture/FeatureServiceFixtures.cs
index c69b492a31..69f771e321 100644
--- a/test/Core.Test/AutoFixture/FeatureServiceFixtures.cs
+++ b/test/Core.Test/AutoFixture/FeatureServiceFixtures.cs
@@ -3,6 +3,7 @@ using AutoFixture;
 using AutoFixture.Kernel;
 using Bit.Core.Context;
 using Bit.Core.Services;
+using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
 
@@ -31,7 +32,8 @@ internal class FeatureServiceBuilder : ISpecimenBuilder
 
         if (pi.ParameterType == typeof(IFeatureService))
         {
-            var featureService = Substitute.For<IFeatureService>();
+            var fixture = new Fixture();
+            var featureService = fixture.WithAutoNSubstitutions().Create<IFeatureService>();
             featureService
                 .IsEnabled(_enabledFeatureFlag, Arg.Any<ICurrentContext>(), Arg.Any<bool>())
                 .Returns(true);