diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
index fed77a8c33..6f2007e8b1 100644
--- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
+++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
@@ -1,36 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
-    <ProjectGuid>{2905FF23-53FB-45E6-AA49-6AF47A172056}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\coretests.props" />
-  <ItemGroup>
-    <Compile Include="AvaloniaObjectTests_DataValidation.cs" />
-    <Compile Include="Collections\CollectionChangedTracker.cs" />
-    <Compile Include="Collections\AvaloniaDictionaryTests.cs" />
-    <Compile Include="Collections\AvaloniaListTests.cs" />
-    <Compile Include="Collections\PropertyChangedTracker.cs" />
-    <Compile Include="AttachedPropertyTests.cs" />
-    <Compile Include="AvaloniaObjectTests_Direct.cs" />
-    <Compile Include="AvaloniaObjectTests_GetSubject.cs" />
-    <Compile Include="AvaloniaObjectTests_GetObservable.cs" />
-    <Compile Include="AvaloniaPropertyRegistryTests.cs" />
-    <Compile Include="AvaloniaObjectTests_Validation.cs" />
-    <Compile Include="AvaloniaObjectTests_Binding.cs" />
-    <Compile Include="AvaloniaObjectTests_Inheritance.cs" />
-    <Compile Include="AvaloniaObjectTests_SetValue.cs" />
-    <Compile Include="AvaloniaObjectTests_GetValue.cs" />
-    <Compile Include="AvaloniaObjectTests_Metadata.cs" />
-    <Compile Include="DirectPropertyTests.cs" />
-    <Compile Include="StyledPropertyTests.cs" />
-    <Compile Include="AvaloniaPropertyTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PriorityValueTests.cs" />
-    <Compile Include="WeakSubscriptionManagerTests.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
-
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
index de315afe3b..c0e807f966 100644
--- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
+++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
@@ -1,70 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-    <PropertyGroup>
-        <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
-        <ProjectGuid>{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}</ProjectGuid>
-    </PropertyGroup>
-    <Import Project="$(MSBuildThisFileDirectory)..\coretests.props" />
-  <ItemGroup>
-    <Compile Include="AppBuilderTests.cs" />
-    <Compile Include="CanvasTests.cs" />
-    <Compile Include="ClassesTests.cs" />
-    <Compile Include="LayoutTransformControlTests.cs" />
-    <Compile Include="Presenters\ItemsPresenterTests_Virtualization_Simple.cs" />
-    <Compile Include="Presenters\ItemsPresenterTests_Virtualization.cs" />
-    <Compile Include="TextBoxTests_DataValidation.cs" />
-    <Compile Include="WindowBaseTests.cs" />
-    <Compile Include="UserControlTests.cs" />
-    <Compile Include="DockPanelTests.cs" />
-    <Compile Include="EnumerableExtensions.cs" />
-    <Compile Include="GridSplitterTests.cs" />
-    <Compile Include="GridTests.cs" />
-    <Compile Include="HeaderedItemsControlTests .cs" />
-    <Compile Include="ControlTests_NameScope.cs" />
-    <Compile Include="Generators\ItemContainerGeneratorTests.cs" />
-    <Compile Include="GridLengthTests.cs" />
-    <Compile Include="ImageTests.cs" />
-    <Compile Include="Presenters\ContentPresenterTests.cs" />
-    <Compile Include="BorderTests.cs" />
-    <Compile Include="ListBoxTests_Single.cs" />
-    <Compile Include="NameScopeTests.cs" />
-    <Compile Include="Primitives\SelectingItemsControlTests_Multiple.cs" />
-    <Compile Include="Presenters\ScrollContentPresenterTests_ILogicalScrollable.cs" />
-    <Compile Include="TextBoxTests.cs" />
-    <Compile Include="TextBlockTests.cs" />
-    <Compile Include="WindowingPlatformMock.cs" />
-    <Compile Include="TreeViewTests.cs" />
-    <Compile Include="Mixins\SelectableMixinTests.cs" />
-    <Compile Include="StackPanelTests.cs" />
-    <Compile Include="Primitives\TrackTests.cs" />
-    <Compile Include="Primitives\PopupTests.cs" />
-    <Compile Include="DropDownTests.cs" />
-    <Compile Include="Presenters\CarouselPresenterTests.cs" />
-    <Compile Include="Presenters\ItemsPresenterTests.cs" />
-    <Compile Include="Presenters\ScrollContentPresenterTests.cs" />
-    <Compile Include="Primitives\TemplatedControlTests.cs" />
-    <Compile Include="Primitives\ScrollBarTests.cs" />
-    <Compile Include="Primitives\RangeBaseTests.cs" />
-    <Compile Include="Primitives\SelectingItemsControlTests_AutoSelect.cs" />
-    <Compile Include="ScrollViewerTests.cs" />
-    <Compile Include="Primitives\SelectingItemsControlTests.cs" />
-    <Compile Include="ListBoxTests.cs" />
-    <Compile Include="ItemsControlTests.cs" />
-    <Compile Include="ContentControlTests.cs" />
-    <Compile Include="DecoratorTests.cs" />
-    <Compile Include="CarouselTests.cs" />
-    <Compile Include="TopLevelTests.cs" />
-    <Compile Include="Primitives\TabStripTests.cs" />
-    <Compile Include="TabControlTests.cs" />
-    <Compile Include="PanelTests.cs" />
-    <Compile Include="ControlTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Templates\TemplateExtensionsTests.cs" />
-    <Compile Include="TestTemplatedControl.cs" />
-    <Compile Include="Utils\AncestorFinderTests.cs" />
-    <Compile Include="Utils\HotKeyManagerTests.cs" />
-    <Compile Include="VirtualizingStackPanelTests.cs" />
-    <Compile Include="WrapPanelTests.cs" />
-  </ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
+  </PropertyGroup>
+  <Import Project="$(MSBuildThisFileDirectory)..\coretests.props" />
   <ItemGroup>
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
@@ -84,6 +22,7 @@
     <PackageReference Include="System.Reactive.Interfaces" Version="3.0.0" />
     <PackageReference Include="System.Reactive.Linq" Version="3.0.0" />
     <PackageReference Include="System.Reactive.PlatformServices" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Reactive.Testing" Version="3.0.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.abstractions" Version="2.0.1" />
     <PackageReference Include="xunit.assert" Version="2.2.0" />
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index c4c637ec5b..ad88cf518c 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -4,33 +4,21 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using Avalonia.Platform;
+using Moq;
+using Xunit;
+
 namespace Avalonia.Controls.UnitTests
 {
-    using System.Reactive;
-    using System.Reactive.Subjects;
-    using Moq;
-    using Avalonia.Controls.Presenters;
-    using Avalonia.Controls.Templates;
-    using Avalonia.Input;
-    using Avalonia.Input.Raw;
-    using Avalonia.Layout;
-    using Avalonia.Platform;
-    using Avalonia.Rendering;
-    using Avalonia.Styling;
-    using Ploeh.AutoFixture;
-    using Ploeh.AutoFixture.AutoMoq;
-    using Splat;
-    using Xunit;
-
     public class WindowTests
     {
         [Fact]
         public void Setting_Title_Should_Set_Impl_Title()
         {
-            using (Locator.CurrentMutable.WithResolver())
+            using (AvaloniaLocator.EnterScope())
             {
                 var windowImpl = new Mock<IWindowImpl>();
-                Locator.CurrentMutable.RegisterConstant(windowImpl.Object, typeof(IWindowImpl));
+                AvaloniaLocator.CurrentMutable.Bind<IWindowImpl>().ToConstant(windowImpl.Object);
 
                 var target = new Window();
 
diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
index 4d038d1cb2..40118188dc 100644
--- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
+++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
@@ -1,33 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-    <PropertyGroup>
-        <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
-        <ProjectGuid>{DB070A10-BF39-4752-8456-86E9D5928478}</ProjectGuid>
-    </PropertyGroup>
-    <Import Project="$(MSBuildThisFileDirectory)..\coretests.props" />
-    <ItemGroup>
-        <Compile Include="FullLayoutTests.cs" />
-        <Compile Include="LayoutManagerTests.cs" />
-        <Compile Include="ArrangeTests.cs" />
-        <Compile Include="MeasureTests.cs" />
-        <Compile Include="Properties\AssemblyInfo.cs" />
-        <Compile Include="TestLayoutRoot.cs" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
-        <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-        <ProjectReference Include="..\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-      <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
+    <ProjectGuid>{DB070A10-BF39-4752-8456-86E9D5928478}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(MSBuildThisFileDirectory)..\coretests.props" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
+    <ProjectReference Include="..\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/coretests.props b/tests/coretests.props
index 57b235dd60..ab9d865b48 100644
--- a/tests/coretests.props
+++ b/tests/coretests.props
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     </PropertyGroup>