diff --git a/test/ZammadAPIClient/Resource/AbstractBaseTest.php b/test/ZammadAPIClient/Resource/AbstractBaseTest.php
index 1f003c5..7f1d554 100644
--- a/test/ZammadAPIClient/Resource/AbstractBaseTest.php
+++ b/test/ZammadAPIClient/Resource/AbstractBaseTest.php
@@ -5,6 +5,7 @@
 use PHPUnit\Framework\TestCase;
 
 use ZammadAPIClient\Client;
+use ZammadAPIClient\Exception\AlreadyFetchedObjectException;
 
 abstract class AbstractBaseTest extends TestCase
 {
@@ -190,11 +191,12 @@ public function testGet()
     }
 
     /**
-     * @expectedException \ZammadAPIClient\Exception\AlreadyFetchedObjectException
      * @depends testCreate
      */
     public function testGetOnFilledObjects()
     {
+        $this->expectException(AlreadyFetchedObjectException::class);
+
         foreach ( self::$created_objects as $created_object ) {
             $created_object_id = $created_object->getID();
             if ( empty( $created_object_id) ) {
@@ -328,11 +330,12 @@ public function testAllPagination()
     }
 
     /**
-     * @expectedException \ZammadAPIClient\Exception\AlreadyFetchedObjectException
      * @depends testCreate
      */
     public function testAllOnFilledObjects()
     {
+        $this->expectException(AlreadyFetchedObjectException::class);
+
         foreach ( self::$created_objects as $created_object ) {
             $created_object_id = $created_object->getID();
             if ( empty( $created_object_id) ) {
diff --git a/test/ZammadAPIClient/Resource/TicketTest.php b/test/ZammadAPIClient/Resource/TicketTest.php
index c1ba818..4523d98 100644
--- a/test/ZammadAPIClient/Resource/TicketTest.php
+++ b/test/ZammadAPIClient/Resource/TicketTest.php
@@ -2,6 +2,7 @@
 
 namespace ZammadAPIClient\Resource;
 
+use ZammadAPIClient\Exception\AlreadyFetchedObjectException;
 use ZammadAPIClient\ResourceType;
 
 class TicketTest extends AbstractBaseTest
@@ -189,11 +190,7 @@ public function testCreate( $values, $expected_success, $expected_article_count
 
         // Compare article data.
         $articles = $object->getTicketArticles();
-        $this->assertInternalType(
-            'array',
-            $articles,
-            'Articles of ticket object must be returned as array.'
-        );
+        $this->assertIsArray($articles);
 
         $this->assertCount(
             $expected_article_count,
@@ -226,11 +223,12 @@ public function testGet()
     }
 
     /**
-     * @expectedException \ZammadAPIClient\Exception\AlreadyFetchedObjectException
      * @depends testCreate
      */
     public function testGetOnFilledObjects()
     {
+        $this->expectException(AlreadyFetchedObjectException::class);
+
         return parent::testGetOnFilledObjects();
     }
 
@@ -259,11 +257,12 @@ public function testAllPagination()
     }
 
     /**
-     * @expectedException \ZammadAPIClient\Exception\AlreadyFetchedObjectException
      * @depends testCreate
      */
     public function testAllOnFilledObjects()
     {
+        $this->expectException(AlreadyFetchedObjectException::class);
+
         return parent::testAllOnFilledObjects();
     }