Index: src/Deltares.DSoilModel.Forms.Tests/BoringLookup1DControlTests.cs
===================================================================
diff -u -r350 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/BoringLookup1DControlTests.cs	(.../BoringLookup1DControlTests.cs)	(revision 350)
+++ src/Deltares.DSoilModel.Forms.Tests/BoringLookup1DControlTests.cs	(.../BoringLookup1DControlTests.cs)	(revision 1080)
@@ -1,10 +1,12 @@
-using Deltares.Geotechnics;
+using System.Threading;
+using Deltares.Geotechnics;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     class BoringLookup1DControlTests : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -17,7 +19,7 @@
         {
             // there are no extra bindings
             // at least let's test assigned name
-            Assert.AreEqual("Boring", PropertyControl.Name);
+            ClassicAssert.AreEqual("Boring", PropertyControl.Name);
         }
 
         [Test]
@@ -28,19 +30,19 @@
                 Boring = new Boring()
             };
 
-            Assert.AreNotSame(lookup, PropertyControl.SelectedObject); // because we haven't assign it yet
+            ClassicAssert.AreNotSame(lookup, PropertyControl.SelectedObject); // because we haven't assign it yet
             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 IsVisibleTest()
         {
-            Assert.IsTrue(PropertyControl.IsVisible); // always true
+            ClassicAssert.IsTrue(PropertyControl.IsVisible); // always true
         }
     }
 }