6 files changed, 61 insertions, 12 deletions
diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1545.cs b/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1545.cs
index 00747db4..7a4030eb 100644
--- a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1545.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1545.cs
@@ -1,10 +1,23 @@
 using NUnit.Framework;
+using Xamarin.Forms.Core.UnitTests;
 
 namespace Xamarin.Forms.Xaml.UnitTests
 {
 	[TestFixture]
 	public class Issue1545
 	{
+		[SetUp]
+		public void Setup()
+		{
+			Device.PlatformServices = new MockPlatformServices { RuntimePlatform = Device.iOS };
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			Device.PlatformServices = null;
+		}
+
 		[Test]
 		public void BindingCanNotBeReused()
 		{
diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1549.cs b/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1549.cs
index c1253040..8b5bf30e 100644
--- a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1549.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1549.cs
@@ -1,6 +1,7 @@
 using System;
 using NUnit.Framework;
 using System.Collections.ObjectModel;
+using Xamarin.Forms.Core.UnitTests;
 
 namespace Xamarin.Forms.Xaml.UnitTests
 {
@@ -58,6 +59,13 @@ namespace Xamarin.Forms.Xaml.UnitTests
 		{
 			SeverityColorConverter.count = 0;
 			InvertBoolenConverter.count = 0;
+			Device.PlatformServices = new MockPlatformServices();
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			Device.PlatformServices = null;
 		}
 
 		[Test]
diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1554.cs b/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1554.cs
index 2e7bfa91..bb7ee70b 100644
--- a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1554.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1554.cs
@@ -1,11 +1,24 @@
 using System;
 using NUnit.Framework;
+using Xamarin.Forms.Core.UnitTests;
 
 namespace Xamarin.Forms.Xaml.UnitTests
 {
 	[TestFixture]
 	public class Issue1554
 	{
+		[SetUp]
+		public void Setup()
+		{
+			Device.PlatformServices = new MockPlatformServices();
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			Device.PlatformServices = null;
+		}
+
 		[Test]
 		public void CollectionItemsInDataTemplate ()
 		{
diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1594.cs b/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1594.cs
index cd942319..91c84f8e 100644
--- a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1594.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1594.cs
@@ -1,11 +1,24 @@
 using System;
 using NUnit.Framework;
+using Xamarin.Forms.Core.UnitTests;
 
 namespace Xamarin.Forms.Xaml.UnitTests
 {
 	[TestFixture]
 	public class Issue1594
 	{
+		[SetUp]
+		public void Setup()
+		{
+			Device.PlatformServices = new MockPlatformServices();
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			Device.PlatformServices = null;
+		}
+
 		[Test]
 		public void OnPlatformForButtonHeight ()
 		{
@@ -23,21 +36,17 @@ namespace Xamarin.Forms.Xaml.UnitTests
 				         </Button.HeightRequest>
 				 </Button>";
 
-			Device.OS = TargetPlatform.iOS;
+			((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.iOS;
 			var button = new Button ().LoadFromXaml (xaml);
 			Assert.AreEqual (33, button.HeightRequest);
 
-			Device.OS = TargetPlatform.Android;
+			((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.Android;
 			button = new Button ().LoadFromXaml (xaml);
 			Assert.AreEqual (44, button.HeightRequest);
 
-			Device.OS = TargetPlatform.WinPhone;
+			((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.WinPhone;
 			button = new Button ().LoadFromXaml (xaml);
 			Assert.AreEqual (44, button.HeightRequest);
-
-
 		}
-
 	}
-}
-
+}
+\ No newline at end of file
diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Pr3384.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/Issues/Pr3384.xaml.cs
index ebf3fe18..d4ae92db 100644
--- a/Xamarin.Forms.Xaml.UnitTests/Issues/Pr3384.xaml.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Pr3384.xaml.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 
 using Xamarin.Forms;
 using NUnit.Framework;
+using Xamarin.Forms.Core.UnitTests;
 
 namespace Xamarin.Forms.Xaml.UnitTests
 {
@@ -22,9 +23,15 @@ namespace Xamarin.Forms.Xaml.UnitTests
 		public class Tests
 		{
 			[SetUp]
-			public void SetUp ()
+			public void Setup()
 			{
-				Device.OS = TargetPlatform.iOS;
+				Device.PlatformServices = new MockPlatformServices { RuntimePlatform = Device.iOS };
+			}
+
+			[TearDown]
+			public void TearDown()
+			{
+				Device.PlatformServices = null;
 			}
 
 			[TestCase (false)]
diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported007.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported007.xaml.cs
index 3d488be2..a5f15816 100644
--- a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported007.xaml.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported007.xaml.cs
@@ -23,7 +23,7 @@ namespace Xamarin.Forms.Xaml.UnitTests
 			[SetUp]
 			public void Setup()
 			{
-				Device.PlatformServices = new MockPlatformServices();
+				Device.PlatformServices = new MockPlatformServices { RuntimePlatform = Device.iOS };
 			}
 
 			[TearDown]
@@ -35,7 +35,6 @@ namespace Xamarin.Forms.Xaml.UnitTests
 			[TestCase(true), TestCase(false)]
 			public void ConstraintsAreEvaluatedWithOnPlatform(bool useCompiledXaml)
 			{
-				Device.OS = TargetPlatform.iOS;
 				var page = new Unreported007(useCompiledXaml);
 				Assert.That(RelativeLayout.GetXConstraint(page.label), Is.TypeOf<Constraint>());
 				Assert.AreEqual(3, RelativeLayout.GetXConstraint(page.label).Compute(null));