Index: src/Deltares.DSoilModel.Forms.Tests/BoringLookup2DControlTest.cs
===================================================================
diff -u -r879 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/BoringLookup2DControlTest.cs	(.../BoringLookup2DControlTest.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/BoringLookup2DControlTest.cs	(.../BoringLookup2DControlTest.cs)	(revision 1080)
@@ -1,11 +1,13 @@
-using Deltares.Geotechnics;
+using System.Threading;
+using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     public class BoringLookup2DControlTest : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -25,9 +27,9 @@
             };
             PropertyControl.SelectedObject = lookup;
 
-            Assert.AreSame(lookup, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(lookup, PropertyControl.SelectedObject);
 
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
 
             TestSpinEditVisibleEnabledValue(PropertyControl, "XEdit", true, true, lookup, x => x.Xlocal, 1.0);
             TestLabelControlVisibleValue(PropertyControl, "XLabel", true, "Lokale x [-]");  // unit should be [m], see issue MDNLIB-796
@@ -38,17 +40,17 @@
         {
             var lookup =  new BoringLookup2D { Boring = new Boring( )};
             PropertyControl.SelectedObject = lookup;
-            Assert.AreSame(lookup, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(lookup, PropertyControl.SelectedObject);
 
             var subcontrol = GetPrivateField<BoringControl>(PropertyControl, "BoringControl");
-            Assert.NotNull(subcontrol);
-            Assert.AreSame(lookup.Boring, subcontrol.SelectedObject);
+            ClassicAssert.NotNull(subcontrol);
+            ClassicAssert.AreSame(lookup.Boring, subcontrol.SelectedObject);
         }
 
         [Test]
         public void TestIsVisible()
         {
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
         }
     }
 }