Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsSqLiteDatabaseFileMigratorTest.cs
===================================================================
diff -u -r975f383dbfa3abd403974d4159ae0bc2b0a5dfcd -r945456b6d565dafb7f55bbb8321e435002480839
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsSqLiteDatabaseFileMigratorTest.cs	(.../RingtoetsSqLiteDatabaseFileMigratorTest.cs)	(revision 975f383dbfa3abd403974d4159ae0bc2b0a5dfcd)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsSqLiteDatabaseFileMigratorTest.cs	(.../RingtoetsSqLiteDatabaseFileMigratorTest.cs)	(revision 945456b6d565dafb7f55bbb8321e435002480839)
@@ -132,9 +132,10 @@
             string targetFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, Path.GetRandomFileName());
             var migrator = new RingtoetsSqLiteDatabaseFileMigrator();
 
-            using (new FileDisposeHelper(targetFilePath))
-            using (File.Create(targetFilePath))
+            using (var fileDisposeHelper = new FileDisposeHelper(targetFilePath))
             {
+                fileDisposeHelper.LockFiles();
+
                 // Call
                 TestDelegate call = () => migrator.Migrate(fromVersionedFile, newVersion, targetFilePath);
 
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsVersionedFileTest.cs
===================================================================
diff -u -r975f383dbfa3abd403974d4159ae0bc2b0a5dfcd -r945456b6d565dafb7f55bbb8321e435002480839
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsVersionedFileTest.cs	(.../RingtoetsVersionedFileTest.cs)	(revision 975f383dbfa3abd403974d4159ae0bc2b0a5dfcd)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsVersionedFileTest.cs	(.../RingtoetsVersionedFileTest.cs)	(revision 945456b6d565dafb7f55bbb8321e435002480839)
@@ -87,9 +87,10 @@
 
             var sourceFile = new RingtoetsVersionedFile(filePath);
 
-            using (new FileDisposeHelper(filePath))
-            using (File.Create(filePath))
+            using (var fileDisposeHelper = new FileDisposeHelper(filePath))
             {
+                fileDisposeHelper.LockFiles();
+
                 // Call
                 TestDelegate call = () => sourceFile.GetVersion();
 
Index: Application/Ringtoets/test/Application.Ringtoets.MigrationConsole.Test/RingtoetsMigrationConsoleTest.cs
===================================================================
diff -u -r1fe151fcfd0dce8fa2c1d93243cae90eee991e70 -r945456b6d565dafb7f55bbb8321e435002480839
--- Application/Ringtoets/test/Application.Ringtoets.MigrationConsole.Test/RingtoetsMigrationConsoleTest.cs	(.../RingtoetsMigrationConsoleTest.cs)	(revision 1fe151fcfd0dce8fa2c1d93243cae90eee991e70)
+++ Application/Ringtoets/test/Application.Ringtoets.MigrationConsole.Test/RingtoetsMigrationConsoleTest.cs	(.../RingtoetsMigrationConsoleTest.cs)	(revision 945456b6d565dafb7f55bbb8321e435002480839)
@@ -166,10 +166,11 @@
 
             var console = new RingtoetsMigrationConsole();
 
-            using (new FileDisposeHelper(targetFilePath))
-            using (File.Create(targetFilePath))
+            using (var fileDisposeHelper = new FileDisposeHelper(targetFilePath))
             using (var consoleOutput = new ConsoleOutput())
             {
+                fileDisposeHelper.LockFiles();
+
                 // When
                 console.ExecuteConsoleTool(new[]
                 {
Index: Application/Ringtoets/test/Application.Ringtoets.MigrationConsole.Test/RingtoetsMigrationToolTest.cs
===================================================================
diff -u -r1fe151fcfd0dce8fa2c1d93243cae90eee991e70 -r945456b6d565dafb7f55bbb8321e435002480839
--- Application/Ringtoets/test/Application.Ringtoets.MigrationConsole.Test/RingtoetsMigrationToolTest.cs	(.../RingtoetsMigrationToolTest.cs)	(revision 1fe151fcfd0dce8fa2c1d93243cae90eee991e70)
+++ Application/Ringtoets/test/Application.Ringtoets.MigrationConsole.Test/RingtoetsMigrationToolTest.cs	(.../RingtoetsMigrationToolTest.cs)	(revision 945456b6d565dafb7f55bbb8321e435002480839)
@@ -157,10 +157,11 @@
             string targetFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, Path.GetRandomFileName());
 
             string consoleText;
-            using (new FileDisposeHelper(targetFilePath))
-            using (File.Create(targetFilePath))
+            using (var fileDisposeHelper = new FileDisposeHelper(targetFilePath))
             using (var consoleOutput = new ConsoleOutput())
             {
+                fileDisposeHelper.LockFiles();
+
                 // When
                 RingtoetsMigrationTool.Main(new[]
                 {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs
===================================================================
diff -u -r1fe151fcfd0dce8fa2c1d93243cae90eee991e70 -r945456b6d565dafb7f55bbb8321e435002480839
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs	(.../StorageSqLiteTest.cs)	(revision 1fe151fcfd0dce8fa2c1d93243cae90eee991e70)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs	(.../StorageSqLiteTest.cs)	(revision 945456b6d565dafb7f55bbb8321e435002480839)
@@ -429,16 +429,14 @@
             FileDisposeHelper fileDisposeHelper = new FileDisposeHelper(tempRingtoetsFile);
             try
             {
+                fileDisposeHelper.LockFiles();
+
                 // Call
                 TestDelegate test = () => storage.SaveProjectAs(tempRingtoetsFile);
 
-                StorageException exception;
-                using (File.Create(tempRingtoetsFile)) // Locks file
-                {
-                    exception = Assert.Throws<StorageException>(test);
-                }
-
                 // Assert
+                StorageException exception = Assert.Throws<StorageException>(test);
+                
                 Assert.IsInstanceOf<Exception>(exception);
                 Assert.IsInstanceOf<IOException>(exception.InnerException);
                 Assert.IsInstanceOf<Exception>(exception);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/SqLiteDatabaseHelperTest.cs
===================================================================
diff -u -r8e5f037ed7df5263d26ba1ada373be196e7a354b -r945456b6d565dafb7f55bbb8321e435002480839
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/SqLiteDatabaseHelperTest.cs	(.../SqLiteDatabaseHelperTest.cs)	(revision 8e5f037ed7df5263d26ba1ada373be196e7a354b)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/SqLiteDatabaseHelperTest.cs	(.../SqLiteDatabaseHelperTest.cs)	(revision 945456b6d565dafb7f55bbb8321e435002480839)
@@ -227,19 +227,18 @@
         public void CreateDatabaseFile_FileAlreadyExistsAndLocked_Fail()
         {
             // Setup
-            string validPath = Path.Combine(testDataPath, "tempFile.rtd");
+            string validPath = Path.Combine(testDataPath, Path.GetRandomFileName());
             const string validScript = ";";
 
-            using (new FileDisposeHelper(validPath))
+            using (var fileDisposeHelper = new FileDisposeHelper(validPath))
             {
-                using (File.Create(validPath))
-                {
-                    // Call
-                    TestDelegate test = () => SqLiteDatabaseHelper.CreateDatabaseFile(validPath, validScript);
+                fileDisposeHelper.LockFiles();
 
-                    // Assert
-                    Assert.Throws<IOException>(test);
-                }
+                // Call
+                TestDelegate test = () => SqLiteDatabaseHelper.CreateDatabaseFile(validPath, validScript);
+
+                // Assert
+                Assert.Throws<IOException>(test);
             }
         }
 
Index: Migration/Core/test/Migration.Core.Storage.Test/VersionedFileMigratorTest.cs
===================================================================
diff -u -rbd8b027fb96bfbce673f38b8997f65e1d795d877 -r945456b6d565dafb7f55bbb8321e435002480839
--- Migration/Core/test/Migration.Core.Storage.Test/VersionedFileMigratorTest.cs	(.../VersionedFileMigratorTest.cs)	(revision bd8b027fb96bfbce673f38b8997f65e1d795d877)
+++ Migration/Core/test/Migration.Core.Storage.Test/VersionedFileMigratorTest.cs	(.../VersionedFileMigratorTest.cs)	(revision 945456b6d565dafb7f55bbb8321e435002480839)
@@ -472,9 +472,9 @@
             versionedFile.Expect(vf => vf.GetVersion()).Return(fromVersion);
             mockRepository.ReplayAll();
 
-            using (new FileDisposeHelper(toLocation))
-            using (File.Create(toLocation))
+            using (var fileDisposeHelper = new FileDisposeHelper(toLocation))
             {
+                fileDisposeHelper.LockFiles();
                 var migrator = new SimpleVersionedFileMigrator(comparer)
                 {
                     CreateScripts =