Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r09fca3285256ab4170c081e3acfc1689b1045325 -r4ca4b2260f66713349c9aae32f5f4b82373c312b
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision 09fca3285256ab4170c081e3acfc1689b1045325)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision 4ca4b2260f66713349c9aae32f5f4b82373c312b)
@@ -430,30 +430,32 @@
             var viewCommands = mocks.StrictMock<IViewCommands>();
             viewCommands.Expect(vs => vs.RemoveAllViewsForItem(failureMechanismContext));
 
-            var treeViewControl = mocks.StrictMock<TreeViewControl>();
-            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
-            var gui = mocks.StrictMock<IGui>();
-            gui.Stub(g => g.ViewCommands).Return(viewCommands);
-            gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-            gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
-            gui.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder);
+                var gui = mocks.StrictMock<IGui>();
+                gui.Stub(g => g.ViewCommands).Return(viewCommands);
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                gui.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            using (var guiPlugin = new RingtoetsGuiPlugin())
-            {
-                guiPlugin.Gui = gui;
+                using (var guiPlugin = new RingtoetsGuiPlugin())
+                {
+                    guiPlugin.Gui = gui;
 
-                var info = GetInfo(guiPlugin);
+                    var info = GetInfo(guiPlugin);
 
-                var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl);
+                    var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl);
 
-                // Call
-                contextMenu.Items[contextMenuRelevancyIndex].PerformClick();
+                    // Call
+                    contextMenu.Items[contextMenuRelevancyIndex].PerformClick();
 
-                // Assert
-                Assert.IsFalse(failureMechanism.IsRelevant);
+                    // Assert
+                    Assert.IsFalse(failureMechanism.IsRelevant);
+                }
             }
             mocks.VerifyAll();
         }
@@ -474,29 +476,32 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var failureMechanismContext = new FailureMechanismContext<IFailureMechanism>(failureMechanism, assessmentSection);
 
-            var treeViewControl = mocks.StrictMock<TreeViewControl>();
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
             var gui = mocks.StrictMock<IGui>();
             gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
             gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
-            gui.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder);
 
-            mocks.ReplayAll();
-
-            using (var guiPlugin = new RingtoetsGuiPlugin())
+            using (var treeViewControl = new TreeViewControl())
             {
-                guiPlugin.Gui = gui;
+                gui.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder);
 
-                var info = GetInfo(guiPlugin);
+                mocks.ReplayAll();
 
-                var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl);
+                using (var guiPlugin = new RingtoetsGuiPlugin())
+                {
+                    guiPlugin.Gui = gui;
 
-                // Call
-                contextMenu.Items[contextMenuRelevancyIndex].PerformClick();
+                    var info = GetInfo(guiPlugin);
 
-                // Assert
-                Assert.IsTrue(failureMechanism.IsRelevant);
+                    var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl);
+
+                    // Call
+                    contextMenu.Items[contextMenuRelevancyIndex].PerformClick();
+
+                    // Assert
+                    Assert.IsTrue(failureMechanism.IsRelevant);
+                }
             }
             mocks.VerifyAll();
         }