Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsPluginTest.cs
===================================================================
diff -u -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c -rded11d27aeaa42cfa05664675265c66d08b2b18e
--- Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsPluginTest.cs	(.../CommonToolsPluginTest.cs)	(revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsPluginTest.cs	(.../CommonToolsPluginTest.cs)	(revision ded11d27aeaa42cfa05664675265c66d08b2b18e)
@@ -34,55 +34,58 @@
         public void GetCommonToolsPluginProperties_Always_ReturnViews()
         {
             // Setup
-            var plugin = new CommonToolsPlugin();
+            using (var plugin = new CommonToolsPlugin())
+            {
+                // Call
+                var viewInfos = plugin.GetViewInfos().ToArray();
 
-            // Call
-            var viewInfos = plugin.GetViewInfos().ToArray();
+                // Assert
+                Assert.NotNull(viewInfos);
+                Assert.AreEqual(1, viewInfos.Length);
 
-            // Assert
-            Assert.NotNull(viewInfos);
-            Assert.AreEqual(1, viewInfos.Length);
+                var richTextFileInfo = viewInfos.First(vi => vi.DataType == typeof(RichTextFile));
 
-            var richTextFileInfo = viewInfos.First(vi => vi.DataType == typeof(RichTextFile));
-
-            Assert.AreEqual(richTextFileInfo.ViewType, typeof(RichTextView));
-            Assert.IsNull(richTextFileInfo.Description);
-            TestHelper.AssertImagesAreEqual(Resources.key, richTextFileInfo.Image);
+                Assert.AreEqual(richTextFileInfo.ViewType, typeof(RichTextView));
+                Assert.IsNull(richTextFileInfo.Description);
+                TestHelper.AssertImagesAreEqual(Resources.key, richTextFileInfo.Image);
+            }
         }
 
         [Test]
         public void RichTextFileViewInfoName_WithoutData_EmptyString()
         {
             // Setup
-            var plugin = new CommonToolsPlugin();
+            using (var plugin = new CommonToolsPlugin())
+            {
+                var info = plugin.GetViewInfos().First(vi => vi.DataType == typeof(RichTextFile));
 
-            var info = plugin.GetViewInfos().First(vi => vi.DataType == typeof(RichTextFile));
+                // Call
+                var name = info.GetViewName(null, null);
 
-            // Call
-            var name = info.GetViewName(null, null);
-
-            // Assert
-            Assert.IsEmpty(name);
+                // Assert
+                Assert.IsEmpty(name);
+            }
         }
 
         [Test]
         public void RichTextFileViewInfoName_WithData_NameOfData()
         {
             // Setup
             var expected = "SomeName";
-            var plugin = new CommonToolsPlugin();
-
-            var info = plugin.GetViewInfos().First(vi => vi.DataType == typeof(RichTextFile));
-            var richTextFile = new RichTextFile
+            using (var plugin = new CommonToolsPlugin())
             {
-                Name = expected
-            };
+                var info = plugin.GetViewInfos().First(vi => vi.DataType == typeof(RichTextFile));
+                var richTextFile = new RichTextFile
+                {
+                    Name = expected
+                };
 
-            // Call
-            var name = info.GetViewName(null, richTextFile);
+                // Call
+                var name = info.GetViewName(null, richTextFile);
 
-            // Assert
-            Assert.AreEqual(expected, name);
+                // Assert
+                Assert.AreEqual(expected, name);
+            }
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rded11d27aeaa42cfa05664675265c66d08b2b18e
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision f1bf048f691ca575f22e8807911ace0338fa425d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision ded11d27aeaa42cfa05664675265c66d08b2b18e)
@@ -444,16 +444,17 @@
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var plugin = new RingtoetsPlugin();
-
-            // Call
-            var childrenWithViewDefinitions = plugin.GetChildDataWithViewDefinitions(assessmentSectionMock);
-
-            // Assert
-            CollectionAssert.AreEqual(new object[]
+            using (var plugin = new RingtoetsPlugin())
             {
-                assessmentSectionMock.FailureMechanismContribution
-            }, childrenWithViewDefinitions);
+                // Call
+                var childrenWithViewDefinitions = plugin.GetChildDataWithViewDefinitions(assessmentSectionMock);
+
+                // Assert
+                CollectionAssert.AreEqual(new object[]
+                {
+                    assessmentSectionMock.FailureMechanismContribution
+                }, childrenWithViewDefinitions);
+            }
             mocks.VerifyAll();
         }