diff --git a/NzbDrone.Test.Common/NBuilderExtensions.cs b/NzbDrone.Core.Test/Framework/NBuilderExtensions.cs
similarity index 90%
rename from NzbDrone.Test.Common/NBuilderExtensions.cs
rename to NzbDrone.Core.Test/Framework/NBuilderExtensions.cs
index 62b3b2cd4..197cb3310 100644
--- a/NzbDrone.Test.Common/NBuilderExtensions.cs
+++ b/NzbDrone.Core.Test/Framework/NBuilderExtensions.cs
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
 using NzbDrone.Core.Datastore;
 
-namespace NzbDrone.Test.Common
+namespace NzbDrone.Core.Test.Framework
 {
     public static class NBuilderExtensions
     {
diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index efbf51bec..69cc4fc9b 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -143,6 +143,7 @@
     <Compile Include="Datastore\ObjectDatabaseFixture.cs" />
     <Compile Include="Framework\CoreTest.cs" />
     <Compile Include="Framework\DbTest.cs" />
+    <Compile Include="Framework\NBuilderExtensions.cs" />
     <Compile Include="HelperTests\XElementHelperTests\ConvertToTFixture.cs" />
     <Compile Include="IndexerSearchTests\DailyEpisodeSearchTests\IndexerDailyEpisodeSearchFixture.cs" />
     <Compile Include="IndexerSearchTests\DailyEpisodeSearchTests\IndexerDailyEpisodeSearch_EpisodeMatch.cs" />
diff --git a/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
index 4ab5faeb1..ef526fd4d 100644
--- a/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
+++ b/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
@@ -53,9 +53,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FizzWare.NBuilder">
-      <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Practices.ServiceLocation">
       <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
@@ -92,7 +89,6 @@
     <Compile Include="ExceptionVerification.cs" />
     <Compile Include="LoggingTest.cs" />
     <Compile Include="MockerExtensions.cs" />
-    <Compile Include="NBuilderExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ReflectionExtensions.cs" />
     <Compile Include="TestBase.cs" />
@@ -108,10 +104,6 @@
       <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
       <Name>NzbDrone.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
-      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
-      <Name>NzbDrone.Core</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
diff --git a/NzbDrone.Test.Common/packages.config b/NzbDrone.Test.Common/packages.config
index 32ed27f91..e4abed86a 100644
--- a/NzbDrone.Test.Common/packages.config
+++ b/NzbDrone.Test.Common/packages.config
@@ -2,7 +2,6 @@
 <packages>
   <package id="CommonServiceLocator" version="1.0" />
   <package id="Moq" version="4.0.10827" />
-  <package id="NBuilder" version="3.0.1.1" targetFramework="net40" />
   <package id="NLog" version="2.0.0.2000" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
   <package id="Unity" version="2.1.505.2" targetFramework="net40" />