Index: test/Common/DelftTools.TestUtils/TestCategory.cs
===================================================================
diff -u -r9ddbc25cc0e22823bf2e4e37c76f3ad04e16fb32 -r2a6b0940219617175db03cf0612e76991780d274
--- test/Common/DelftTools.TestUtils/TestCategory.cs	(.../TestCategory.cs)	(revision 9ddbc25cc0e22823bf2e4e37c76f3ad04e16fb32)
+++ test/Common/DelftTools.TestUtils/TestCategory.cs	(.../TestCategory.cs)	(revision 2a6b0940219617175db03cf0612e76991780d274)
@@ -1,31 +1,8 @@
 namespace DelftTools.TestUtils
 {
-    /// <summary>
-    /// [Uncategorized] .............. unit tests (less than 500ms), or marked with some custom categories<br/>
-    ///<br/>
-    /// The following categories started with prefix "Build." are used for integration tests which are handled <br/>
-    /// in a special way on a build server:<br/>
-    /// <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/>
-    /// <br/>
-    /// These categories must be always used as mutually exclusive: NEVER USE 2 OF THESE CATEGORIES AT THE SAME TIME!<br/>
-    ///<br/>
-    /// Exceptions from the rule above (use of 2 categories at the same time):<br/>
-    /// <br/>
-    /// Build.WorkInProgress ......... tests which are currently in development<br/>
-    /// Build.Slow ................... tests which take more than 500 ms but less than 20 s to run<br/>
-    /// </summary>
     public class TestCategory
     {
         /// <summary>
-        /// Checks how fast specific code runs. 
-        /// Speed requirements: faster than 20000 ms
-        /// <seealso cref="TestHelper.AssertIsFasterThan(float,System.Action)"/>
-        /// </summary>
-        public const string Performance = "Build.Performance";
-
-        /// <summary>
         /// Test is incomplete and unfinished.
         /// </summary>
         public const string WorkInProgress = "Build.WorkInProgress";
Index: test/Common/SharpMap.UI.Tests/Tools/SelectToolTest.cs
===================================================================
diff -u -r89a1f10b30400ae7b2cb1fb364610407a389cfa5 -r2a6b0940219617175db03cf0612e76991780d274
--- test/Common/SharpMap.UI.Tests/Tools/SelectToolTest.cs	(.../SelectToolTest.cs)	(revision 89a1f10b30400ae7b2cb1fb364610407a389cfa5)
+++ test/Common/SharpMap.UI.Tests/Tools/SelectToolTest.cs	(.../SelectToolTest.cs)	(revision 2a6b0940219617175db03cf0612e76991780d274)
@@ -198,7 +198,6 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
         public void SetLayerWithManySelectedFeaturesVisibilityFalseShouldBeFast()
         {
             var mapControl = new MapControl();
Index: test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell/DeltaShell.Gui/DeltaShellGuiIntegrationTest.cs
===================================================================
diff -u -r9824e5ee110d2700bf0240d6596f79c04d4fc0ba -r2a6b0940219617175db03cf0612e76991780d274
--- test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell/DeltaShell.Gui/DeltaShellGuiIntegrationTest.cs	(.../DeltaShellGuiIntegrationTest.cs)	(revision 9824e5ee110d2700bf0240d6596f79c04d4fc0ba)
+++ test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell/DeltaShell.Gui/DeltaShellGuiIntegrationTest.cs	(.../DeltaShellGuiIntegrationTest.cs)	(revision 2a6b0940219617175db03cf0612e76991780d274)
@@ -383,8 +383,7 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
-        public void StartWithCommonPluginsIsFast()
+        public void StartWithCommonPluginsShouldBeFast()
         {
             TestHelper.AssertIsFasterThan(7500, StartWithCommonPlugins);
         }
@@ -408,9 +407,8 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
         [Category(TestCategory.WorkInProgress)]
-        public void CreateNewProjectAfterStartWithCommonPluginsIsFast()
+        public void CreateNewProjectAfterStartWithCommonPluginsShouldBeFast()
         {
             DeltaShellApplication.TemporaryProjectSavedAsynchroneously = true;
 
@@ -433,8 +431,7 @@
         }
 
         [Test]
-        [Category(TestCategory.Performance)]
-        public void ExitShouldBeVeryFast()
+        public void ExitShouldBeFast()
         {
             using (var gui = new DeltaShellGui())
             {
Index: test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/MapViewTest.cs
===================================================================
diff -u -r5401a1d5d90f6000c2bfb8d9240752473fe1855a -r2a6b0940219617175db03cf0612e76991780d274
--- test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/MapViewTest.cs	(.../MapViewTest.cs)	(revision 5401a1d5d90f6000c2bfb8d9240752473fe1855a)
+++ test/DeltaShell/DeltaShell.Plugins.SharpMapGis.Tests/Forms/MapViewTest.cs	(.../MapViewTest.cs)	(revision 2a6b0940219617175db03cf0612e76991780d274)
@@ -116,7 +116,6 @@
         [TestCase(@"osm\europe_western_europe_netherlands_location.shp", ShapeType.Point)]
         [TestCase(@"osm\europe_western_europe_netherlands_water.shp", ShapeType.Polygon)]
         [TestCase(@"osm\europe_western_europe_netherlands_highway.shp", ShapeType.PolyLine)]
-        [Category(TestCategory.Performance)]
         [Category(TestCategory.Slow)]
         public void RenderLargeShapefile(string filePath, ShapeType type)
         {