diff --git a/test/MUXControlsTestApp/App.xaml b/test/MUXControlsTestApp/App.xaml
index cd317cc98d..f71c92e60e 100644
--- a/test/MUXControlsTestApp/App.xaml
+++ b/test/MUXControlsTestApp/App.xaml
@@ -24,6 +24,8 @@
                 <ResourceDictionary x:Name="_styleOverridesPlaceholder"/>
             </ResourceDictionary.MergedDictionaries>
 
+            <Thickness x:Key="AppScrollViewerScrollBarMargin">1</Thickness> <!-- use 0 when switching to Version1 -->
+
             <Style x:Key="StandardGroupHeader" TargetType="TextBlock">
                 <Setter Property="FontSize" Value="22"/>
                 <Setter Property="Margin" Value="0,0,0,8"/>
diff --git a/test/MUXControlsTestApp/Themes/DisableAnimationsStyles.xaml b/test/MUXControlsTestApp/Themes/DisableAnimationsStyles.xaml
index fdc4c6c9fa..755c330b2d 100644
--- a/test/MUXControlsTestApp/Themes/DisableAnimationsStyles.xaml
+++ b/test/MUXControlsTestApp/Themes/DisableAnimationsStyles.xaml
@@ -40,7 +40,7 @@
                             <Grid
                                 Grid.Column="1"
                                 Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
-                                Padding="{ThemeResource ScrollViewerScrollBarMargin}">
+                                Padding="{ThemeResource AppScrollViewerScrollBarMargin}">
                                 <ScrollBar x:Name="VerticalScrollBar"
                                     IsTabStop="False"
                                     Maximum="{TemplateBinding ScrollableHeight}"
@@ -53,7 +53,7 @@
                             <Grid
                                 Grid.Row="1"
                                 Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
-                                Padding="{ThemeResource ScrollViewerScrollBarMargin}">
+                                Padding="{ThemeResource AppScrollViewerScrollBarMargin}">
                                 <ScrollBar x:Name="HorizontalScrollBar"
                                     IsTabStop="False"
                                     Maximum="{TemplateBinding ScrollableWidth}"