Index: Core/Common/test/Core.Common.Integration.Tests/DeltaShell/Application.Ringtoets/DeltaShellGuiIntegrationTest.cs
===================================================================
diff -u -r4904857016716bc8d02826a2ccc25c36ff46b945 -rd2f10c188457df15e301d0a30e4886a0ce1e461f
--- Core/Common/test/Core.Common.Integration.Tests/DeltaShell/Application.Ringtoets/DeltaShellGuiIntegrationTest.cs	(.../DeltaShellGuiIntegrationTest.cs)	(revision 4904857016716bc8d02826a2ccc25c36ff46b945)
+++ Core/Common/test/Core.Common.Integration.Tests/DeltaShell/Application.Ringtoets/DeltaShellGuiIntegrationTest.cs	(.../DeltaShellGuiIntegrationTest.cs)	(revision d2f10c188457df15e301d0a30e4886a0ce1e461f)
@@ -47,38 +47,6 @@
         }
 
         [Test]
-        public void RunManyActivitiesCancelCheckForThreadingIssuesTools9791()
-        {
-            using (var gui = new DeltaShellGui())
-            {
-                var app = gui.Application;
-                gui.Run();
-
-                Action onShown = delegate
-                {
-                    var smallActivity = new TestActivity2();
-
-                    for (int i = 0; i < 10; i++)
-                    {
-                        app.RunActivityInBackground(smallActivity);
-
-                        // cancel
-                        while (!app.IsActivityRunning())
-                        {
-                            Thread.Sleep(1);
-                        }
-                        app.ActivityRunner.CancelAll();
-                        while (app.IsActivityRunning())
-                        {
-                            System.Windows.Forms.Application.DoEvents();
-                        }
-                    }
-                };
-                WpfTestHelper.ShowModal((Control) gui.MainWindow, onShown);
-            }
-        }
-
-        [Test]
         public void ProgressDialogIsModal()
         {
             if (!Environment.UserInteractive)
Index: Core/Common/test/Core.Common.Tests/Core/DelftShellApplicationTest.cs
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rd2f10c188457df15e301d0a30e4886a0ce1e461f
--- Core/Common/test/Core.Common.Tests/Core/DelftShellApplicationTest.cs	(.../DelftShellApplicationTest.cs)	(revision eee6c7815d1e418eac38c1c552fb279c0887ef55)
+++ Core/Common/test/Core.Common.Tests/Core/DelftShellApplicationTest.cs	(.../DelftShellApplicationTest.cs)	(revision d2f10c188457df15e301d0a30e4886a0ce1e461f)
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Threading;
-using Application.Ringtoets;
 using Core.Common.Base;
-using Core.Common.Gui;
 using NUnit.Framework;
 using Rhino.Mocks;
 
@@ -62,14 +60,12 @@
 
             mocks.ReplayAll();
 
-            using (var gui = new DeltaShellGui())
+            using (var deltaShellApplication = new DeltaShellApplication())
             {
-                var app = gui.Application;
-                gui.Application = app;
-                gui.Application.Plugins.Add(plugin);
-                gui.Run();
+                deltaShellApplication.Plugins.Add(plugin);
+                deltaShellApplication.Run();
 
-                gui.Dispose();
+                deltaShellApplication.Dispose();
 
                 mocks.VerifyAll();
             }