diff --git a/Perspex.sln b/Perspex.sln
index 61fda99a60..de7af4b229 100644
--- a/Perspex.sln
+++ b/Perspex.sln
@@ -92,6 +92,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.ReactiveUI", "src\P
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Markup.Xaml.UnitTests", "Tests\Perspex.Markup.Xaml.UnitTests\Perspex.Markup.Xaml.UnitTests.csproj", "{99135EAB-653D-47E4-A378-C96E1278CA44}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Cairo.RenderTests", "tests\Perspex.RenderTests\Perspex.Cairo.RenderTests.csproj", "{E106CF37-4066-4615-B684-172A6D30B058}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -218,6 +220,10 @@ Global
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E106CF37-4066-4615-B684-172A6D30B058}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -241,5 +247,6 @@ Global
 		{54F237D5-A70A-4752-9656-0C70B1A7B047} = {B9894058-278A-46B5-B6ED-AD613FCC03B3}
 		{FB05AC90-89BA-4F2F-A924-F37875FB547C} = {B9894058-278A-46B5-B6ED-AD613FCC03B3}
 		{99135EAB-653D-47E4-A378-C96E1278CA44} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
+		{E106CF37-4066-4615-B684-172A6D30B058} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/Perspex.RenderTests/Controls/BorderTests.cs b/tests/Perspex.RenderTests/Controls/BorderTests.cs
index 4e2606d8c1..e0207ffc6d 100644
--- a/tests/Perspex.RenderTests/Controls/BorderTests.cs
+++ b/tests/Perspex.RenderTests/Controls/BorderTests.cs
@@ -4,7 +4,11 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+#if PERSPEX_CAIRO
+namespace Perspex.Cairo.RenderTests.Controls
+#else
 namespace Perspex.Direct2D1.RenderTests.Controls
+#endif
 {
     using Perspex.Controls;
     using Perspex.Layout;
diff --git a/tests/Perspex.RenderTests/Controls/ImageTests.cs b/tests/Perspex.RenderTests/Controls/ImageTests.cs
index 90511ac125..84c44022f1 100644
--- a/tests/Perspex.RenderTests/Controls/ImageTests.cs
+++ b/tests/Perspex.RenderTests/Controls/ImageTests.cs
@@ -4,7 +4,11 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+#if PERSPEX_CAIRO
+namespace Perspex.Cairo.RenderTests.Controls
+#else
 namespace Perspex.Direct2D1.RenderTests.Controls
+#endif
 {
     using System.IO;
     using Perspex.Controls;
diff --git a/tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj b/tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj
index ffeb20949a..e28d91a6b4 100644
--- a/tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj
+++ b/tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <PropertyGroup>
@@ -8,8 +9,8 @@
     <ProjectGuid>{E106CF37-4066-4615-B684-172A6D30B058}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Perspex.Direct2D1.RenderTests</RootNamespace>
-    <AssemblyName>Perspex.Direct2D1.RenderTests</AssemblyName>
+    <RootNamespace>Perspex.Cairo.RenderTests</RootNamespace>
+    <AssemblyName>Perspex.Cairo.RenderTests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -17,7 +18,8 @@
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
-    <NuGetPackageImportStamp>93023d49</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,16 +39,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Magick.NET-x86, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=x86">
-      <HintPath>..\..\packages\Magick.NET-Q8-x86.7.0.0.0014\lib\net40-client\Magick.NET-x86.dll</HintPath>
+    <Reference Include="Magick.NET-AnyCPU, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0018\lib\net40-client\Magick.NET-AnyCPU.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Magick.NET.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Magick.NET-Q8-x86.7.0.0.0014\lib\net40-client\Magick.NET.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Magick.NET.Wrapper-x86, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=x86">
-      <HintPath>..\..\packages\Magick.NET-Q8-x86.7.0.0.0014\lib\net40-client\Magick.NET.Wrapper-x86.dll</HintPath>
+      <HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0018\lib\net40-client\Magick.NET.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
@@ -83,39 +81,39 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Cairo\Perspex.Cairo\Perspex.Cairo.csproj">
+    <ProjectReference Include="..\..\src\Gtk\Perspex.Cairo\Perspex.Cairo.csproj">
       <Project>{fb05ac90-89ba-4f2f-a924-f37875fb547c}</Project>
       <Name>Perspex.Cairo</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
       <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
       <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
       <Name>Perspex.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Perspex.Input</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
       <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
       <Name>Perspex.Styling</Name>
     </ProjectReference>
@@ -152,7 +150,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj b/tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
index bc8fd43376..d9ec85cc0b 100644
--- a/tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
+++ b/tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
@@ -41,13 +41,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Magick.NET-AnyCPU, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0017\lib\net40-client\Magick.NET-AnyCPU.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Magick.NET-AnyCPU">
+      <HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0018\lib\net40-client\Magick.NET-AnyCPU.dll</HintPath>
     </Reference>
-    <Reference Include="Magick.NET.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0017\lib\net40-client\Magick.NET.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Magick.NET.Core">
+      <HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0018\lib\net40-client\Magick.NET.Core.dll</HintPath>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
diff --git a/tests/Perspex.RenderTests/Shapes/EllipseTests.cs b/tests/Perspex.RenderTests/Shapes/EllipseTests.cs
index 0029b61660..43517ed248 100644
--- a/tests/Perspex.RenderTests/Shapes/EllipseTests.cs
+++ b/tests/Perspex.RenderTests/Shapes/EllipseTests.cs
@@ -4,7 +4,11 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+#if PERSPEX_CAIRO
+namespace Perspex.Cairo.RenderTests.Shapes
+#else
 namespace Perspex.Direct2D1.RenderTests.Shapes
+#endif
 {
     using Perspex.Controls;
     using Perspex.Controls.Shapes;
diff --git a/tests/Perspex.RenderTests/Shapes/PathTests.cs b/tests/Perspex.RenderTests/Shapes/PathTests.cs
index c415bef233..7edd59fdce 100644
--- a/tests/Perspex.RenderTests/Shapes/PathTests.cs
+++ b/tests/Perspex.RenderTests/Shapes/PathTests.cs
@@ -4,7 +4,11 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+#if PERSPEX_CAIRO
+namespace Perspex.Cairo.RenderTests.Shapes
+#else
 namespace Perspex.Direct2D1.RenderTests.Shapes
+#endif
 {
     using Perspex.Controls;
     using Perspex.Controls.Shapes;
diff --git a/tests/Perspex.RenderTests/Shapes/RectangleTests.cs b/tests/Perspex.RenderTests/Shapes/RectangleTests.cs
index 926796d1b6..ee6b502529 100644
--- a/tests/Perspex.RenderTests/Shapes/RectangleTests.cs
+++ b/tests/Perspex.RenderTests/Shapes/RectangleTests.cs
@@ -4,7 +4,11 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+#if PERSPEX_CAIRO
+namespace Perspex.Cairo.RenderTests.Shapes
+#else
 namespace Perspex.Direct2D1.RenderTests.Shapes
+#endif
 {
     using Perspex.Controls;
     using Perspex.Controls.Shapes;
diff --git a/tests/Perspex.RenderTests/TestBase.cs b/tests/Perspex.RenderTests/TestBase.cs
index 128f0ecaa7..f61db925bf 100644
--- a/tests/Perspex.RenderTests/TestBase.cs
+++ b/tests/Perspex.RenderTests/TestBase.cs
@@ -3,7 +3,12 @@
 // Copyright 2014 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
+
+#if PERSPEX_CAIRO
+namespace Perspex.Cairo.RenderTests
+#else
 namespace Perspex.Direct2D1.RenderTests
+#endif
 {
     using System.IO;
     using System.Runtime.CompilerServices;
diff --git a/tests/Perspex.RenderTests/app.config b/tests/Perspex.RenderTests/app.config
index 888a32bd16..369fc74fc1 100644
--- a/tests/Perspex.RenderTests/app.config
+++ b/tests/Perspex.RenderTests/app.config
@@ -18,6 +18,10 @@
         <assemblyIdentity name="SharpDX" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.6.3.0" newVersion="2.6.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Mono.Cairo" publicKeyToken="0738eb9f132ed756" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/tests/Perspex.RenderTests/packages.config b/tests/Perspex.RenderTests/packages.config
index f64b93b396..4d88d81099 100644
--- a/tests/Perspex.RenderTests/packages.config
+++ b/tests/Perspex.RenderTests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Magick.NET-Q16-AnyCPU" version="7.0.0.0017" targetFramework="net45" />
+  <package id="Magick.NET-Q16-AnyCPU" version="7.0.0.0018" targetFramework="net45" />
   <package id="Splat" version="1.6.2" targetFramework="net45" />
   <package id="StyleCop.Analyzers" version="1.0.0-beta008" targetFramework="net45" developmentDependency="true" />
   <package id="xunit" version="2.0.0" targetFramework="net45" />