diff --git a/UITests/UITests.App/App.xaml b/UITests/UITests.App/App.xaml
index 74e9cd2df91..1b9cedbffb7 100644
--- a/UITests/UITests.App/App.xaml
+++ b/UITests/UITests.App/App.xaml
@@ -1,7 +1,4 @@
-<Application
-    x:Class="UITests.App.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:UITests.App">
-
-</Application>
+<Application x:Class="UITests.App.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:UITests.App" />
diff --git a/UITests/UITests.App/App.xaml.cs b/UITests/UITests.App/App.xaml.cs
index 23f5035b6d5..8a2c5f4ddda 100644
--- a/UITests/UITests.App/App.xaml.cs
+++ b/UITests/UITests.App/App.xaml.cs
@@ -3,6 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.UI.Xaml;
@@ -13,6 +16,8 @@ namespace UITests.App
 {
     public sealed partial class App
     {
+        internal Dictionary<string, Type> TestPages { get; } = new Dictionary<string, Type>();
+
         public App()
         {
             this.InitializeComponent();
@@ -26,6 +31,21 @@ public App()
         /// <param name="e">Details about the launch request and process.</param>
         protected override void OnLaunched(LaunchActivatedEventArgs e)
         {
+            var pages = Assembly.GetExecutingAssembly().GetTypes()
+                .Where(t => t.IsSubclassOf(typeof(Page)));
+
+            foreach (var page in pages)
+            {
+                try
+                {
+                    TestPages.Add(page.Name, page);
+                }
+                catch (ArgumentException ex)
+                {
+                    throw new Exception("Two or more test pages share a name.", ex);
+                }
+            }
+
             Frame rootFrame = Window.Current.Content as Frame;
 
             // Do not repeat app initialization when the Window already has content,
@@ -53,7 +73,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
                     // When the navigation stack isn't restored navigate to the first page,
                     // configuring the new page by passing required information as a navigation
                     // parameter
-                    rootFrame.Navigate(typeof(MainPage), e.Arguments);
+                    rootFrame.Navigate(typeof(MainTestHost), e.Arguments);
                 }
 
                 // Ensure the current window is active
diff --git a/UITests/UITests.App/MainPage.xaml.cs b/UITests/UITests.App/MainPage.xaml.cs
deleted file mode 100644
index b44c1291f46..00000000000
--- a/UITests/UITests.App/MainPage.xaml.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace UITests.App
-{
-    public sealed partial class MainPage
-    {
-        public MainPage()
-        {
-            InitializeComponent();
-        }
-
-        private void Button_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
-        {
-            textBlock.Text = "Clicked";
-        }
-    }
-}
diff --git a/UITests/UITests.App/MainPage.xaml b/UITests/UITests.App/MainTestHost.xaml
similarity index 59%
rename from UITests/UITests.App/MainPage.xaml
rename to UITests/UITests.App/MainTestHost.xaml
index d38db07e3e3..d48168bfd81 100644
--- a/UITests/UITests.App/MainPage.xaml
+++ b/UITests/UITests.App/MainTestHost.xaml
@@ -1,5 +1,5 @@
 <Page
-    x:Class="UITests.App.MainPage"
+    x:Class="UITests.App.MainTestHost"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:testhelpers="using:AppTestAutomationHelpers"
@@ -9,11 +9,16 @@
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
     <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
         <testhelpers:TestAutomationHelpersPanel />
 
-        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Button Content="Click Me" Click="Button_Click"/>
-            <TextBlock x:Name="textBlock"/>
+        <Frame x:Name="navigationFrame" />
+        
+        <StackPanel Orientation="Horizontal" Grid.Row="1" >
+            <TextBox x:Name="PageName" KeyDown="PageName_KeyDown"/>
         </StackPanel>
     </Grid>
 </Page>
diff --git a/UITests/UITests.App/MainTestHost.xaml.cs b/UITests/UITests.App/MainTestHost.xaml.cs
new file mode 100644
index 00000000000..230a54d5931
--- /dev/null
+++ b/UITests/UITests.App/MainTestHost.xaml.cs
@@ -0,0 +1,46 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
+
+namespace UITests.App
+{
+    /// <summary>
+    /// MainPage hosting all other test pages.
+    /// </summary>
+    public sealed partial class MainTestHost
+    {
+        private readonly Dictionary<string, Type> pageMap;
+
+        public MainTestHost()
+        {
+            InitializeComponent();
+            pageMap = ((App)Application.Current).TestPages;
+        }
+
+        private void PageName_KeyDown(object sender, KeyRoutedEventArgs e)
+        {
+            if (e.Key == Windows.System.VirtualKey.Enter && sender is TextBox s)
+            {
+                OpenPage(s.Text);
+            }
+        }
+
+        private void OpenPage(string pageName)
+        {
+            try
+            {
+                navigationFrame.Navigate(pageMap[pageName]);
+            }
+            catch (KeyNotFoundException ex)
+            {
+                throw new Exception("Cannot find page.", ex);
+            }
+        }
+    }
+}
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 48fc8de5936..2b00af8784c 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -27,6 +27,7 @@
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <IsTestHost>true</IsTestHost>
   </PropertyGroup>
   <Target Name="Pack">
   </Target>
@@ -130,8 +131,8 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MainPage.xaml.cs">
-      <DependentUpon>MainPage.xaml</DependentUpon>
+    <Compile Include="MainTestHost.xaml.cs">
+      <DependentUpon>MainTestHost.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -155,7 +156,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="MainPage.xaml">
+    <Page Include="MainTestHost.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -252,4 +253,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+  <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" Label="Shared" />
+</Project>
\ No newline at end of file
diff --git a/UITests/UITests.Tests.MSTest/MSTestInterop.cs b/UITests/UITests.Tests.MSTest/MSTestInterop.cs
index dc1740ba15e..bf26a116446 100644
--- a/UITests/UITests.Tests.MSTest/MSTestInterop.cs
+++ b/UITests/UITests.Tests.MSTest/MSTestInterop.cs
@@ -11,6 +11,7 @@ namespace UITests.Tests
     // TAEF has a different terms for the same concepts as compared with MSTest.
     // In order to allow both to use the same test files, we'll define these helper classes
     // to translate TAEF into MSTest.
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:File name should match first type name", Justification = "Shim helpers")]
     public static class Log
     {
         public static void Comment(string format, params object[] args)
@@ -41,6 +42,7 @@ private static void LogMessage(string format, object[] args)
         }
     }
 
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Shim helpers.")]
     public static class LogController
     {
         public static void InitializeLogging()
@@ -49,6 +51,7 @@ public static void InitializeLogging()
         }
     }
 
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Shim helpers.")]
     public static class Verify
     {
         // TODO: implement
diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
index 67a02acf40f..e451ea73ecd 100644
--- a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
+++ b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
@@ -13,6 +13,8 @@
     <PlatformTarget>x86</PlatformTarget>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
+
+    <IsTestHarness>true</IsTestHarness>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,5 +29,5 @@
     <PackageReference Include="Microsoft.Windows.Apps.Test" Version="1.0.181205002" />
   </ItemGroup>
 
-  <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" />
+  <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" Label="Shared" />
 </Project>
\ No newline at end of file
diff --git a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs
new file mode 100644
index 00000000000..afb4c5d749a
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs
@@ -0,0 +1,56 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Windows.Apps.Test.Foundation.Controls;
+using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
+using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
+
+#if USING_TAEF
+using WEX.Logging.Interop;
+using WEX.TestExecution;
+using WEX.TestExecution.Markup;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
+
+namespace UITests.Tests
+{
+    [TestClass]
+    public class TextBoxMaskTest : UITestBase
+    {
+        [ClassInitialize]
+        [TestProperty("RunAs", "User")]
+        [TestProperty("Classification", "ScenarioTestSuite")]
+        [TestProperty("Platform", "Any")]
+        public static void ClassInitialize(TestContext testContext)
+        {
+            TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+        }
+
+        [ClassCleanup]
+        public static void ClassCleanup()
+        {
+            TestEnvironment.AssemblyCleanupWorker(WinUICsUWPSampleApp);
+        }
+
+        [TestMethod]
+        [TestPage("TextBoxMaskTestPage")]
+        public void TestTextBoxMaskBinding_Property()
+        {
+            var initialValue = FindElement.ById<TextBlock>("InitialValueTextBlock").GetText();
+            var textBox = FindElement.ById<Edit>("TextBox");
+
+            Verify.AreEqual(initialValue, textBox.GetText());
+
+            var changeButton = FindElement.ById<Button>("ChangeButton");
+
+            changeButton.Click();
+            Wait.ForIdle();
+
+            var newValue = FindElement.ById<TextBlock>("NewValueTextBlock").GetText();
+
+            Verify.AreEqual(newValue, textBox.GetText());
+        }
+    }
+}
diff --git a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTestPage.xaml b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTestPage.xaml
new file mode 100644
index 00000000000..bae98eb03c0
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTestPage.xaml
@@ -0,0 +1,47 @@
+<Page x:Class="UITests.App.Pages.TextBoxMaskTestPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+      mc:Ignorable="d">
+    <Grid HorizontalAlignment="Center"
+          VerticalAlignment="Center">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="10" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="10" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <Button x:Name="ChangeButton"
+                Grid.Row="0"
+                Grid.Column="0"
+                Click="ChangeButton_Click"
+                Content="Change Target Value" />
+        <TextBox x:Name="TextBox"
+                 Grid.Row="0"
+                 Grid.Column="2"
+                 Width="120"
+                 Padding="0,4,0,0"
+                 VerticalAlignment="Center"
+                 extensions:TextBoxMask.CustomMask="5:[0-5]"
+                 extensions:TextBoxMask.Mask="99:59:59"
+                 Text="{x:Bind Value, Mode=OneWay}"
+                 TextAlignment="Center" />
+        <TextBlock x:Name="InitialValueTextBlock"
+                   Grid.Row="2"
+                   Grid.Column="0"
+                   HorizontalAlignment="Center"
+                   Text="{x:Bind InitialValue}" />
+        <TextBlock x:Name="NewValueTextBlock"
+                   Grid.Row="2"
+                   Grid.Column="2"
+                   HorizontalAlignment="Center"
+                   Text="{x:Bind NewValue}" />
+    </Grid>
+</Page>
diff --git a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTestPage.xaml.cs b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTestPage.xaml.cs
new file mode 100644
index 00000000000..f872d27017e
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTestPage.xaml.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace UITests.App.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class TextBoxMaskTestPage : Page
+    {
+        private const string INITIAL_VALUE = "12:50:59";
+        private const string NEW_VALUE = "00:00:00";
+
+        public string InitialValue => INITIAL_VALUE;
+
+        public string NewValue => NEW_VALUE;
+
+        public string Value
+        {
+            get { return (string)GetValue(ValueProperty); }
+            set { SetValue(ValueProperty, value); }
+        }
+
+        public static readonly DependencyProperty ValueProperty =
+            DependencyProperty.Register(nameof(Value), typeof(string), typeof(TextBoxMaskTestPage), new PropertyMetadata(INITIAL_VALUE));
+
+        public TextBoxMaskTestPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void ChangeButton_Click(object sender, RoutedEventArgs e)
+        {
+            Value = NEW_VALUE;
+        }
+    }
+}
diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs b/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs
new file mode 100644
index 00000000000..71aa2afc892
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs
@@ -0,0 +1,55 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Windows.Apps.Test.Foundation.Controls;
+using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
+using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
+
+#if USING_TAEF
+using WEX.Logging.Interop;
+using WEX.TestExecution;
+using WEX.TestExecution.Markup;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
+
+namespace UITests.Tests
+{
+    [TestClass]
+    public class SimpleTest : UITestBase
+    {
+        [ClassInitialize]
+        [TestProperty("RunAs", "User")]
+        [TestProperty("Classification", "ScenarioTestSuite")]
+        [TestProperty("Platform", "Any")]
+        public static void ClassInitialize(TestContext testContext)
+        {
+            TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+        }
+
+        [ClassCleanup]
+        public static void ClassCleanup()
+        {
+            TestEnvironment.AssemblyCleanupWorker(WinUICsUWPSampleApp);
+        }
+
+        [TestMethod]
+        [TestPage("SimpleTestPage")]
+        public void SimpleTestMethod()
+        {
+            var button = new Button(FindElement.ByName("Click Me"));
+            var textBlock = new TextBlock(FindElement.ById("textBlock"));
+
+            Verify.IsNotNull(button);
+
+            Verify.AreEqual(string.Empty, textBlock.GetText());
+
+            button.Click();
+
+            Wait.ForIdle();
+
+            Verify.AreEqual("Clicked", textBlock.GetText());
+        }
+    }
+}
\ No newline at end of file
diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml b/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml
new file mode 100644
index 00000000000..183cec0fc07
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml
@@ -0,0 +1,14 @@
+<Page x:Class="UITests.App.Pages.SimpleTestPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+      mc:Ignorable="d">
+    <StackPanel HorizontalAlignment="Center"
+                VerticalAlignment="Center">
+        <Button Click="Button_Click"
+                Content="Click Me" />
+        <TextBlock x:Name="textBlock" />
+    </StackPanel>
+</Page>
diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml.cs b/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml.cs
new file mode 100644
index 00000000000..d884d35b2fe
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace UITests.App.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class SimpleTestPage : Page
+    {
+        public SimpleTestPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            textBlock.Text = "Clicked";
+        }
+    }
+}
diff --git a/UITests/UITests.Tests.Shared/TestAssembly.cs b/UITests/UITests.Tests.Shared/TestAssembly.cs
index 6b78746ffcd..220541a3e22 100644
--- a/UITests/UITests.Tests.Shared/TestAssembly.cs
+++ b/UITests/UITests.Tests.Shared/TestAssembly.cs
@@ -2,12 +2,19 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
+
 #if USING_TAEF
+using WEX.Logging.Interop;
+using WEX.TestExecution;
 using WEX.TestExecution.Markup;
 #else
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 #endif
-using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
 
 namespace UITests.Tests
 {
diff --git a/UITests/UITests.Tests.Shared/TestPageAttribute.cs b/UITests/UITests.Tests.Shared/TestPageAttribute.cs
new file mode 100644
index 00000000000..48eaa18920e
--- /dev/null
+++ b/UITests/UITests.Tests.Shared/TestPageAttribute.cs
@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace UITests.Tests
+{
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    public sealed class TestPageAttribute : Attribute
+    {
+        public TestPageAttribute(string xamlFile)
+        {
+            if (string.IsNullOrWhiteSpace(xamlFile))
+            {
+                throw new ArgumentException($"'{nameof(xamlFile)}' cannot be null or whitespace", nameof(xamlFile));
+            }
+
+            XamlFile = xamlFile;
+        }
+
+        public string XamlFile { get; private set; }
+    }
+}
diff --git a/UITests/UITests.Tests.Shared/Tests.cs b/UITests/UITests.Tests.Shared/UITestBase.cs
similarity index 64%
rename from UITests/UITests.Tests.Shared/Tests.cs
rename to UITests/UITests.Tests.Shared/UITestBase.cs
index bba017d8c9e..6ee2f590582 100644
--- a/UITests/UITests.Tests.Shared/Tests.cs
+++ b/UITests/UITests.Tests.Shared/UITestBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -20,8 +20,7 @@
 
 namespace UITests.Tests
 {
-    [TestClass]
-    public class Tests
+    public abstract class UITestBase
     {
         public static TestApplicationInfo WinUICsUWPSampleApp
         {
@@ -77,41 +76,42 @@ public static TestSetupHelper.TestSetupHelperOptions TestSetupHelperOptions
             }
         }
 
-        [ClassInitialize]
-        [TestProperty("RunAs", "User")]
-        [TestProperty("Classification", "ScenarioTestSuite")]
-        [TestProperty("Platform", "Any")]
-        public static void ClassInitialize(TestContext testContext)
-        {
-            TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
-        }
-
-        [ClassCleanup]
-        public static void ClassCleanup()
-        {
-            TestEnvironment.AssemblyCleanupWorker(WinUICsUWPSampleApp);
-        }
+        public TestContext TestContext { get; set; }
 
-        [TestCleanup]
-        public void TestCleanup()
+        [TestInitialize]
+        public void TestInitalize()
         {
-        }
-
-        [TestMethod]
-        public void SimpleLaunchTest()
-        {
-            var button = new Button(FindElement.ByName("Click Me"));
-            var textBlock = new TextBlock(FindElement.ById("textBlock"));
-
-            Verify.IsNotNull(button);
-
-            Verify.AreEqual(string.Empty, textBlock.GetText());
+#if USING_TAEF
+            var fullTestName = TestContext.TestName;
+            var lastDotIndex = fullTestName.LastIndexOf('.');
+            var testName = fullTestName.Substring(lastDotIndex + 1);
+            var theClassName = fullTestName.Substring(0, lastDotIndex);
+#else
+            var testName = TestContext.TestName;
+            var theClassName = TestContext.FullyQualifiedTestClassName;
+#endif
+            var currentlyRunningClassType = AppDomain.CurrentDomain.GetAssemblies().SelectMany(a => a.GetTypes()).FirstOrDefault(f => f.FullName == theClassName);
+            if (!(Type.GetType(theClassName) is Type type))
+            {
+                Verify.Fail("Type is null. TestClassName : " + theClassName);
+                return;
+            }
 
-            button.Click();
+            if (!(type.GetMethod(testName) is MethodInfo method))
+            {
+                Verify.Fail("Mothod is null. TestClassName : " + theClassName + " Testname: " + testName);
+                return;
+            }
 
-            Wait.ForIdle();
+            if (!(method.GetCustomAttribute(typeof(TestPageAttribute), true) is TestPageAttribute attribute))
+            {
+                Verify.Fail("Attribute is null. TestClassName : " + theClassName);
+                return;
+            }
 
-            Verify.AreEqual("Clicked", textBlock.GetText());
+            var pageTextBox = FindElement.ById<Edit>("PageName");
+            pageTextBox.SetValue(attribute.XamlFile);
+            KeyboardHelper.PressKey(Key.Enter);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems
index d4e528749ac..b4dd4ad0eb0 100644
--- a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems
+++ b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems
@@ -8,8 +8,38 @@
   <PropertyGroup Label="Configuration">
     <Import_RootNamespace>UITests.Tests.Shared</Import_RootNamespace>
   </PropertyGroup>
+
+  <Choose>
+    <!-- When we're in the test harness include all '*Test.cs' files -->
+    <When Condition="'$(IsTestHarness)' == 'true'">
+      <ItemGroup>
+        <Compile Include="$(MSBuildThisFileDirectory)**\*Test.cs" Exclude="**\bin\**\*Test.cs;**\obj\**\*Test.cs"/>
+        <!-- Base test helpers -->
+        <Compile Include="$(MSBuildThisFileDirectory)UITestBase.cs" />
+        <Compile Include="$(MSBuildThisFileDirectory)TestAssembly.cs" />
+        <Compile Include="$(MSBuildThisFileDirectory)TestPageAttribute.cs" />
+      </ItemGroup>
+    </When>
+  </Choose>
+
+  <Choose>
+    <!-- When we're in the UI app used by the test harness, include all the pages -->
+    <When Condition="'$(IsTestHost)' == 'true'">
+      <ItemGroup>
+        <Page Include="$(MSBuildThisFileDirectory)**\*Page.xaml" Exclude="**\bin\**\*Page.xaml;**\obj\**\*Page.xaml" Link="%(RecursiveDir)%(FileName)%(Extension)" SubType="Designer" Generator="MSBuild:Compile" />
+        <Compile Include="$(MSBuildThisFileDirectory)**\*Page.xaml.cs" DependentUpon="%(Filename)" />
+      </ItemGroup>
+    </When>
+  </Choose>
+
+  <!-- Have a None Include as well to make all items visible in VS in the Shared Project -->
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)TestAssembly.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Tests.cs" />
+    <None Include="$(MSBuildThisFileDirectory)**\*Test.cs" Exclude="**\bin\**\*Test.cs;**\obj\**\*Test.cs"/>
+    <None Include="$(MSBuildThisFileDirectory)**\*Page.xaml" Exclude="**\bin\**\*Page.xaml;**\obj\**\*Page.xaml" SubType="Designer" Generator="MSBuild:Compile" />
+    <None Include="$(MSBuildThisFileDirectory)**\*Page.xaml.cs" DependentUpon="%(Filename)" />
+    <!-- Base test helpers -->
+    <None Include="$(MSBuildThisFileDirectory)UITestBase.cs" />
+    <None Include="$(MSBuildThisFileDirectory)TestAssembly.cs" />
+    <None Include="$(MSBuildThisFileDirectory)TestPageAttribute.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
index 1fd9fc11c4f..31045675444 100644
--- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -15,6 +15,8 @@
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
     <IsPackable>false</IsPackable>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+
+    <IsTestHarness>true</IsTestHarness>
   </PropertyGroup>
 
   <ItemGroup>
@@ -64,5 +66,5 @@
     </None>
   </ItemGroup>
 
-  <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" />
+  <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" Label="Shared" />
 </Project>
\ No newline at end of file
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 19e1beb3709..12a741d429f 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -134,14 +134,17 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UITests.Tests.Shared", "UIT
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{1d8b0260-5c17-41da-9c38-1e37441b3925}*SharedItemsImports = 13
 		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{4e9466d1-d5aa-46ac-801b-c8fdab79f0d4}*SharedItemsImports = 13
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{5524523e-db0f-41f7-a0d4-43128422a342}*SharedItemsImports = 4
+		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{5f720475-e263-4a5a-8c88-2b805b45b5bc}*SharedItemsImports = 5
 		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{9b3a94a6-0d29-4523-880b-6938e2efeef7}*SharedItemsImports = 13
 		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{bab1caf4-c400-4a7f-a987-c576de63cffd}*SharedItemsImports = 4
+		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{c8182ef0-77fb-4b43-a588-c71748a309c7}*SharedItemsImports = 5
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{d9bdbc68-3d0a-47fc-9c88-0bf769101644}*SharedItemsImports = 5
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -895,6 +898,8 @@ Global
 		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.ActiveCfg = Release|x86
 		{67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.Build.0 = Release|x86
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.Build.0 = Debug|x86
+		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.Deploy.0 = Debug|x86
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.ActiveCfg = Debug|ARM
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Build.0 = Debug|ARM
 		{05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Deploy.0 = Debug|ARM