Index: test/Common/DelftTools.TestUtils/TestCategory.cs
===================================================================
diff -u -r2a0bc77430323211d808546837ab2be0291e0ad6 -r9ddbc25cc0e22823bf2e4e37c76f3ad04e16fb32
--- test/Common/DelftTools.TestUtils/TestCategory.cs	(.../TestCategory.cs)	(revision 2a0bc77430323211d808546837ab2be0291e0ad6)
+++ test/Common/DelftTools.TestUtils/TestCategory.cs	(.../TestCategory.cs)	(revision 9ddbc25cc0e22823bf2e4e37c76f3ad04e16fb32)
@@ -8,7 +8,6 @@
     /// <br/>
     /// Build.Integration ................ general integration tests (many classes, almost no mocks, mix of windows.forms, data access)<br/>
     ///     Build.Performance. ........... integration tests which assert execution time using <see cref="TestHelper.AssertIsFasterThan(float,System.Action)"/><br/>
-    ///     Build.WindowsForms ........... integration tests which pop-up forms<br/>
     /// <br/>
     /// These categories must be always used as mutually exclusive: NEVER USE 2 OF THESE CATEGORIES AT THE SAME TIME!<br/>
     ///<br/>
@@ -20,13 +19,6 @@
     public class TestCategory
     {
         /// <summary>
-        /// Shows forms or dialogs during run.
-        /// 
-        /// Speed requirements: faster than 4000 ms
-        /// </summary>
-        public const string WindowsForms = "Build.WindowsForms";
-
-        /// <summary>
         /// Checks how fast specific code runs. 
         /// Speed requirements: faster than 20000 ms
         /// <seealso cref="TestHelper.AssertIsFasterThan(float,System.Action)"/>
Index: test/Common/DelftTools.Tests/Controls/Swf/TreeViewControls/TreeViewNodePresenterBaseTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r9ddbc25cc0e22823bf2e4e37c76f3ad04e16fb32
--- test/Common/DelftTools.Tests/Controls/Swf/TreeViewControls/TreeViewNodePresenterBaseTest.cs	(.../TreeViewNodePresenterBaseTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Tests/Controls/Swf/TreeViewControls/TreeViewNodePresenterBaseTest.cs	(.../TreeViewNodePresenterBaseTest.cs)	(revision 9ddbc25cc0e22823bf2e4e37c76f3ad04e16fb32)
@@ -16,7 +16,6 @@
         #region Remove
 
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void OnCollectionRemoveWithCollectionBasedNodePresenter()
         {
             var group = new TestGroup();
@@ -44,7 +43,6 @@
         }
 
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void ModifyCollectionShouldUpdateNodeHasChildren()
         {
             var group = new TestGroup();
@@ -77,7 +75,6 @@
         }
         
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void OnCollectionRemoveWithPropertyBasedNodePresenter()
         {
             var group = new TestGroup();
@@ -129,7 +126,6 @@
         #region Add
 
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void OnCollectionAddWithCollectionBasedNodePresenter()
         {
             var group = new TestGroup();
@@ -158,7 +154,6 @@
         }
 
         [Test]
-        [Category(TestCategory.WindowsForms)]
         public void OnCollectionAddWithPropertyBasedNodePresenter()
         {
             var group = new TestGroup();
Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/VectorLayerAttributeTableViewTest.cs
===================================================================
diff -u -r03707d5a0ca6b2d83563bc5f407bd4a327d22c0e -r9ddbc25cc0e22823bf2e4e37c76f3ad04e16fb32
--- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/VectorLayerAttributeTableViewTest.cs	(.../VectorLayerAttributeTableViewTest.cs)	(revision 03707d5a0ca6b2d83563bc5f407bd4a327d22c0e)
+++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/VectorLayerAttributeTableViewTest.cs	(.../VectorLayerAttributeTableViewTest.cs)	(revision 9ddbc25cc0e22823bf2e4e37c76f3ad04e16fb32)
@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using DelftTools.TestUtils;
 using DelftTools.Utils;
 using DelftTools.Utils.Collections.Generic;
 using DelftTools.Utils.ComponentModel;
@@ -19,9 +18,8 @@
     public class VectorLayerAttributeTableViewTest
     {
         [Test]
-        [NUnit.Framework.Category(TestCategory.WindowsForms)]
         public void DeleteOfCustomRowObjectMustDeleteOriginalFeature()
-        {   
+        {
             var features = new List<City>
                                 {
                                     new City {Name = "Amsterdam", Population = 1000000, Geometry = new Point(0,0)},
@@ -35,16 +33,12 @@
 
             var featureRowObjects = (IList) view.TableView.Data;
 
-            WindowsFormsTestHelper.ShowModal(view, f =>
-                {
-                    Assert.AreEqual(2, features.Count);
-                    featureRowObjects.Remove(featureRowObjects[0]);
-                    Assert.AreEqual(1, features.Count);
-                });
+            Assert.AreEqual(2, features.Count);
+            featureRowObjects.Remove(featureRowObjects[0]);
+            Assert.AreEqual(1, features.Count);
         }
 
         [Test]
-        [NUnit.Framework.Category(TestCategory.WindowsForms)]
         public void AddingFeatureMustAlsoAddCustomRowObject()
         {
             var features = new EventedList<City>
@@ -58,16 +52,12 @@
             var view = new VectorLayerAttributeTableView { Data = layer };
             view.SetCreateFeatureRowFunction(feature => new CityProperties((City)feature));
 
-            WindowsFormsTestHelper.ShowModal(view, (f) =>
-            {
-                Assert.AreEqual(1, ((IList)view.TableView.Data).Count);
-                featureCollection.Add(new City { Name = "The Hague", Population = 90000, Geometry = new Point(-20, -40) });
-                Assert.AreEqual(2, ((IList)view.TableView.Data).Count);
-            });
+            Assert.AreEqual(1, ((IList)view.TableView.Data).Count);
+            featureCollection.Add(new City { Name = "The Hague", Population = 90000, Geometry = new Point(-20, -40) });
+            Assert.AreEqual(2, ((IList)view.TableView.Data).Count);
         }
 
         [Test]
-        [NUnit.Framework.Category(TestCategory.WindowsForms)]
         public void ShowAndCheckDynamicReadOnly()
         {
             var features = new []
@@ -79,13 +69,10 @@
             var layer = new VectorLayer {DataSource = new FeatureCollection {Features = features}};
             var view = new VectorLayerAttributeTableView { Data = layer };
 
-            WindowsFormsTestHelper.ShowModal(view, f =>
-                {
-                    Assert.IsFalse(view.TableView.CellIsReadOnly(0, view.TableView.Columns[1]));
-                    Assert.IsTrue(view.TableView.CellIsReadOnly(1, view.TableView.Columns[1]));
-                });
+            Assert.IsFalse(view.TableView.CellIsReadOnly(0, view.TableView.Columns[1]));
+            Assert.IsTrue(view.TableView.CellIsReadOnly(1, view.TableView.Columns[1]));
         }
-        
+
         public class City : Feature
         {
             [FeatureAttribute]