diff --git a/src/Check/DatabaseCheck.php b/src/Check/DatabaseCheck.php
index 2eba2878..118eca13 100644
--- a/src/Check/DatabaseCheck.php
+++ b/src/Check/DatabaseCheck.php
@@ -138,10 +138,17 @@ function (CliExecuteEvent $e) {
             ],
             function () use ($db) {
                 unset($db);
-                @unlink($this->userDatabasePath);
-                @unlink($this->solutionDatabasePath);
+                $this->unlink($this->userDatabasePath);
+                $this->unlink($this->solutionDatabasePath);
                 rmdir($this->databaseDirectory);
             }
         );
     }
+
+    private function unlink(string $file): void
+    {
+        if (file_exists($file)) {
+            unlink($file);
+        }
+    }
 }
diff --git a/test/BaseTest.php b/test/BaseTest.php
index f7fe6cc0..d25b9061 100644
--- a/test/BaseTest.php
+++ b/test/BaseTest.php
@@ -31,7 +31,9 @@ public function getTemporaryFile(string $filename, string $content = null): stri
             return $file;
         }
 
-        @mkdir(dirname($file), 0777, true);
+        if (!file_exists(dirname($file))) {
+            mkdir(dirname($file), 0777, true);
+        }
 
         $content !== null
             ? file_put_contents($file, $content)
diff --git a/test/Check/DatabaseCheckTest.php b/test/Check/DatabaseCheckTest.php
index b1e6ca15..3e3db2b1 100644
--- a/test/Check/DatabaseCheckTest.php
+++ b/test/Check/DatabaseCheckTest.php
@@ -89,7 +89,7 @@ private function getRunnerManager(ExerciseInterface $exercise, EventDispatcher $
     public function testIfDatabaseFolderExistsExceptionIsThrown(): void
     {
         $eventDispatcher = new EventDispatcher(new ResultAggregator());
-        @mkdir($this->dbDir);
+        mkdir($this->dbDir, 0777, true);
         try {
             $this->check->attach($eventDispatcher);
             $this->fail('Exception was not thrown');