Index: src/Deltares.DSoilModel.Forms.Tests/BoringControlTests.cs
===================================================================
diff -u -r955 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/BoringControlTests.cs	(.../BoringControlTests.cs)	(revision 955)
+++ src/Deltares.DSoilModel.Forms.Tests/BoringControlTests.cs	(.../BoringControlTests.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)]
     class BoringControlTests : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -50,16 +52,16 @@
         {
             var b = new Boring();
 
-            Assert.AreNotSame(b, PropertyControl.SelectedObject);
+            ClassicAssert.AreNotSame(b, PropertyControl.SelectedObject);
 
             PropertyControl.SelectedObject = b;
-            Assert.AreSame(b, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(b, PropertyControl.SelectedObject);
         }
 
         [Test]
         public void TestIsVisible_AlwaysTrue()
         {
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
         }
     }
 }