Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoetsDemoProjectRibbonTest.cs
===================================================================
diff -u -rce9e1d476f00cfb42ce2a8ab6c762baf5abfd97b -r6a5d7b40b7ba4dcb73e393075338352d194e97c2
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoetsDemoProjectRibbonTest.cs	(.../RingtoetsDemoProjectRibbonTest.cs)	(revision ce9e1d476f00cfb42ce2a8ab6c762baf5abfd97b)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoetsDemoProjectRibbonTest.cs	(.../RingtoetsDemoProjectRibbonTest.cs)	(revision 6a5d7b40b7ba4dcb73e393075338352d194e97c2)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -35,7 +36,7 @@
     public class RingtoetsDemoProjectRibbonTest
     {
         [Test]
-        [RequiresSTA]
+        [Apartment(ApartmentState.STA)]
         public void DefaultConstructor_Always_CreatesControl()
         {
             // Setup
@@ -54,7 +55,7 @@
         }
 
         [Test]
-        [RequiresSTA]
+        [Apartment(ApartmentState.STA)]
         public void OpenChartViewButton_OnClick_ExecutesOpenChartViewCommand()
         {
             // Setup
@@ -79,7 +80,7 @@
         }
 
         [Test]
-        [RequiresSTA]
+        [Apartment(ApartmentState.STA)]
         public void OpenMapViewButton_OnClick_OpensView()
         {
             // Setup