diff --git a/tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs b/tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs
index 4774a47706..563b270605 100644
--- a/tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs
+++ b/tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs
@@ -45,6 +45,17 @@ namespace Perspex.Controls.UnitTests
             Assert.Equal(target, presenter.TemplatedParent);
         }
 
+        [Fact]
+        public void Offset_Should_Be_Coerced_To_Viewport()
+        {
+            var target = new ScrollViewer();
+            target.SetValue(ScrollViewer.ExtentProperty, new Size(20, 20));
+            target.SetValue(ScrollViewer.ViewportProperty, new Size(10, 10));
+            target.Offset = new Vector(12, 12);
+
+            Assert.Equal(new Vector(10, 10), target.Offset);
+        }
+
         private Control CreateTemplate(ScrollViewer control)
         {
             return new Grid