diff --git a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
index 7c95f02a7a..7bcb120850 100644
--- a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
@@ -203,7 +203,9 @@ namespace Avalonia.Controls.UnitTests
         }
 
         private static TestServices Services => TestServices.MockThreadingInterface.With(
-            standardCursorFactory: Mock.Of<IStandardCursorFactory>());
+            fontManagerImpl: new MockFontManagerImpl(),
+            standardCursorFactory: Mock.Of<IStandardCursorFactory>(),
+            textShaperImpl: new MockTextShaperImpl());
 
         private IControlTemplate CreateTemplate()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
index c803b93364..682f0eaadb 100644
--- a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Controls.UnitTests
 {
     public class TimePickerTests
     {
-        [Fact(Skip = "FIX ME ASAP")]
+        [Fact]
         public void SelectedTimeChanged_Should_Fire_When_SelectedTime_Set()
         {
             using (UnitTestApplication.Start(Services))
@@ -98,9 +98,10 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-
         private static TestServices Services => TestServices.MockThreadingInterface.With(
-            standardCursorFactory: Mock.Of<IStandardCursorFactory>());
+            fontManagerImpl: new MockFontManagerImpl(),
+            standardCursorFactory: Mock.Of<IStandardCursorFactory>(),
+            textShaperImpl: new MockTextShaperImpl());
 
         private IControlTemplate CreateTemplate()
         {