2 files changed, 26 insertions, 11 deletions
diff --git a/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml b/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml
index cd40b053..b3652081 100644
--- a/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml
+++ b/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
 			 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
 			 x:Class="Xamarin.Forms.Xaml.UnitTests.StringLiterals">
-	<Label x:Name="label0" Text="{}Foo" />
-	<Label x:Name="label1" Text="{}{Foo}" />
-	<Label x:Name="label2">
-		{}Foo
-	</Label>
-	<Label x:Name="label3">
-		<Label.Text>
+	<StackLayout>
+		<Label x:Name="label0" Text="{}Foo" />
+		<Label x:Name="label1" Text="{}{Foo}" />
+		<Label x:Name="label2">
 			{}Foo
-		</Label.Text>
-	</Label>
-</ContentPage>
+		</Label>
+		<Label x:Name="label3">
+			<Label.Text>
+				{}Foo
+			</Label.Text>
+		</Label>
+	</StackLayout>
+</ContentPage>
+\ No newline at end of file
diff --git a/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml.cs
index 256ee5f9..b5954aee 100644
--- a/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using Xamarin.Forms;
 
 using NUnit.Framework;
+using Xamarin.Forms.Core.UnitTests;
 
 namespace Xamarin.Forms.Xaml.UnitTests
 {
@@ -22,6 +23,18 @@ namespace Xamarin.Forms.Xaml.UnitTests
 		[TestFixture]
 		public class Tests
 		{
+			[SetUp]
+			public void Setup()
+			{
+				Device.PlatformServices = new MockPlatformServices();
+			}
+
+			[TearDown]
+			public void TearDown()
+			{
+				Device.PlatformServices = null;
+			}
+
 			[TestCase(false)]
 			[TestCase(true)]
 			public void EscapedStringsAreTreatedAsLiterals (bool useCompiledXaml)