diff --git a/tst/Data/DatabaseTest.php b/tst/Data/DatabaseTest.php
index 2edf136e..a5be6c4a 100644
--- a/tst/Data/DatabaseTest.php
+++ b/tst/Data/DatabaseTest.php
@@ -43,7 +43,7 @@ class DatabaseTest extends TestCase
         $this->assertNotEquals($salt, '');
         ServerSalt::setStore($this->_model);
         ServerSalt::get();
-        $this->assertFileNotExists($file, 'legacy ServerSalt got removed');
+        $this->assertFileDoesNotExist($file, 'legacy ServerSalt got removed');
         $this->assertEquals($salt, ServerSalt::get(), 'ServerSalt got preserved & migrated');
     }
 
diff --git a/tst/ModelTest.php b/tst/ModelTest.php
index 63c42411..f947c291 100644
--- a/tst/ModelTest.php
+++ b/tst/ModelTest.php
@@ -184,10 +184,6 @@ class ModelTest extends TestCase
         $paste->store();
     }
 
-    /**
-     * @expectedException Exception
-     * @expectedExceptionCode 76
-     */
     public function testStoreFail()
     {
         $path = $this->_path . DIRECTORY_SEPARATOR . 'model-store-test.sq3';
@@ -224,13 +220,11 @@ class ModelTest extends TestCase
 
         $paste = $model->getPaste();
         $paste->setData($pasteData);
+        $this->expectException(Exception::class);
+        $this->expectExceptionCode(76);
         $paste->store();
     }
 
-    /**
-     * @expectedException Exception
-     * @expectedExceptionCode 70
-     */
     public function testCommentStoreFail()
     {
         $path = $this->_path . DIRECTORY_SEPARATOR . 'model-test.sq3';
@@ -272,13 +266,11 @@ class ModelTest extends TestCase
 
         $comment = $paste->getComment(Helper::getPasteId());
         $comment->setData($commentData);
+        $this->expectException(Exception::class);
+        $this->expectExceptionCode(70);
         $comment->store();
     }
 
-    /**
-     * @expectedException Exception
-     * @expectedExceptionCode 69
-     */
     public function testCommentDuplicate()
     {
         $pasteData   = Helper::getPastePost();