diff --git a/NzbDrone.Core.Test/AutoMoq/AutoMoqer.cs b/NzbDrone.Core.Test/AutoMoq/AutoMoqer.cs
index b5535fb24..91803a469 100644
--- a/NzbDrone.Core.Test/AutoMoq/AutoMoqer.cs
+++ b/NzbDrone.Core.Test/AutoMoq/AutoMoqer.cs
@@ -14,6 +14,7 @@ namespace AutoMoq
 {
     public class AutoMoqer
     {
+        internal readonly MockBehavior DefaultBehavior = MockBehavior.Default;
         internal Type ResolveType;
         private IUnityContainer container;
         private IDictionary<Type, object> registeredMocks;
@@ -23,6 +24,13 @@ namespace AutoMoq
             SetupAutoMoqer(new UnityContainer());
         }
 
+        public AutoMoqer(MockBehavior defaultBehavior)
+        {
+            DefaultBehavior = defaultBehavior;
+            SetupAutoMoqer(new UnityContainer());
+
+        }
+
         internal AutoMoqer(IUnityContainer container)
         {
             SetupAutoMoqer(container);
@@ -37,7 +45,12 @@ namespace AutoMoq
             return result;
         }
 
-        public virtual Mock<T> GetMock<T>(MockBehavior behavior = MockBehavior.Default) where T : class
+        public virtual Mock<T> GetMock<T>() where T : class
+        {
+            return GetMock<T>(DefaultBehavior);
+        }
+
+        public virtual Mock<T> GetMock<T>(MockBehavior behavior) where T : class
         {
             ResolveType = null;
             var type = GetTheMockType<T>();
@@ -112,10 +125,10 @@ namespace AutoMoq
         private void SetupAutoMoqer(IUnityContainer container)
         {
             this.container = container;
-            registeredMocks = new Dictionary<Type, object>();
-
-            AddTheAutoMockingContainerExtensionToTheContainer(container);
             container.RegisterInstance(this);
+
+            registeredMocks = new Dictionary<Type, object>();
+            AddTheAutoMockingContainerExtensionToTheContainer(container);
         }
 
         private static void AddTheAutoMockingContainerExtensionToTheContainer(IUnityContainer container)
diff --git a/NzbDrone.Core.Test/AutoMoq/Unity/AutoMockingBuilderStrategy.cs b/NzbDrone.Core.Test/AutoMoq/Unity/AutoMockingBuilderStrategy.cs
index 26297916e..c89ab8491 100644
--- a/NzbDrone.Core.Test/AutoMoq/Unity/AutoMockingBuilderStrategy.cs
+++ b/NzbDrone.Core.Test/AutoMoq/Unity/AutoMockingBuilderStrategy.cs
@@ -16,7 +16,8 @@ namespace AutoMoq.Unity
 
         public AutoMockingBuilderStrategy(IEnumerable<Type> registeredTypes, IUnityContainer container)
         {
-            mockFactory = new MockFactory(MockBehavior.Loose);
+            var autoMoqer = container.Resolve<AutoMoqer>();
+            mockFactory = new MockFactory(autoMoqer.DefaultBehavior);
             this.registeredTypes = registeredTypes;
             this.container = container;
         }
@@ -62,19 +63,19 @@ namespace AutoMoq.Unity
 
         private Mock InvokeTheMockCreationMethod(MethodInfo createMethod)
         {
-            return (Mock) createMethod.Invoke(mockFactory, new object[] {new List<object>().ToArray()});
+            return (Mock)createMethod.Invoke(mockFactory, new object[] { new List<object>().ToArray() });
         }
 
         private MethodInfo GenerateAnInterfaceMockCreationMethod(Type type)
         {
             var createMethodWithNoParameters = mockFactory.GetType().GetMethod("Create", EmptyArgumentList());
 
-            return createMethodWithNoParameters.MakeGenericMethod(new[] {type});
+            return createMethodWithNoParameters.MakeGenericMethod(new[] { type });
         }
 
         private static Type[] EmptyArgumentList()
         {
-            return new[] {typeof (object[])};
+            return new[] { typeof(object[]) };
         }
 
         #endregion