diff --git a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs
index 4ae0e4d71..7959ce5b7 100644
--- a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs
+++ b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs
@@ -6,11 +6,12 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using Microsoft.Practices.Unity;
+using Unity;
 using Moq;
 using Moq.Language.Flow;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Test.Common.AutoMoq.Unity;
+using Unity.Resolution;
 
 [assembly: InternalsVisibleTo("AutoMoq.Tests")]
 
diff --git a/src/NzbDrone.Test.Common/AutoMoq/Unity/AutoMockingBuilderStrategy.cs b/src/NzbDrone.Test.Common/AutoMoq/Unity/AutoMockingBuilderStrategy.cs
index b586a3416..1756fe656 100644
--- a/src/NzbDrone.Test.Common/AutoMoq/Unity/AutoMockingBuilderStrategy.cs
+++ b/src/NzbDrone.Test.Common/AutoMoq/Unity/AutoMockingBuilderStrategy.cs
@@ -1,12 +1,11 @@
-
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Microsoft.Practices.ObjectBuilder2;
-using Microsoft.Practices.Unity;
+using Unity;
 using Moq;
+using Unity.Strategies;
+using Unity.Builder;
 
 namespace NzbDrone.Test.Common.AutoMoq.Unity
 {
@@ -24,7 +23,7 @@ namespace NzbDrone.Test.Common.AutoMoq.Unity
             _container = container;
         }
 
-        public override void PreBuildUp(IBuilderContext context)
+        public override void PreBuildUp(ref BuilderContext context)
         {
             var autoMoqer = _container.Resolve<AutoMoqer>();
 
@@ -43,12 +42,12 @@ namespace NzbDrone.Test.Common.AutoMoq.Unity
         {
             var mocker = _container.Resolve<AutoMoqer>();
             return TypeIsNotRegistered(type) && (mocker.ResolveType == null || mocker.ResolveType != type);
-            //return TypeIsNotRegistered(type) && type.IsInterface;
         }
 
-        private static Type GetTheTypeFromTheBuilderContext(IBuilderContext context)
+        private static Type GetTheTypeFromTheBuilderContext(BuilderContext context)
         {
-            return (context.OriginalBuildKey).Type;
+            // return (context.OriginalBuildKey).Type;
+            return context.Type;
         }
 
         private bool TypeIsNotRegistered(Type type)
@@ -82,4 +81,4 @@ namespace NzbDrone.Test.Common.AutoMoq.Unity
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/src/NzbDrone.Test.Common/AutoMoq/Unity/AutoMockingContainerExtension.cs b/src/NzbDrone.Test.Common/AutoMoq/Unity/AutoMockingContainerExtension.cs
index 9c6170ce6..b764c929d 100644
--- a/src/NzbDrone.Test.Common/AutoMoq/Unity/AutoMockingContainerExtension.cs
+++ b/src/NzbDrone.Test.Common/AutoMoq/Unity/AutoMockingContainerExtension.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Microsoft.Practices.Unity;
-using Microsoft.Practices.Unity.ObjectBuilder;
+using Unity.Builder;
+using Unity.Extension;
 
 namespace NzbDrone.Test.Common.AutoMoq.Unity
 {
@@ -36,4 +36,4 @@ namespace NzbDrone.Test.Common.AutoMoq.Unity
 
         #endregion
     }
-}
\ No newline at end of file
+}