1 files changed, 6 insertions, 8 deletions
diff --git a/plugins/CustomVariables/tests/Integration/ModelTest.php b/plugins/CustomVariables/tests/Integration/ModelTest.php
index 5324cfdf22..5e8bff8deb 100644
--- a/plugins/CustomVariables/tests/Integration/ModelTest.php
+++ b/plugins/CustomVariables/tests/Integration/ModelTest.php
@@ -21,7 +21,7 @@ class ModelTest extends IntegrationTestCase
 {
     private static $cvarScopes = array('page', 'visit', 'conversion');
 
-    public function setUp()
+    public function setUp(): void
     {
         // do not call parent::setUp() since it expects database to be created,
         // but DB for this test is removed in tearDown
@@ -29,26 +29,24 @@ class ModelTest extends IntegrationTestCase
         self::$fixture->performSetUp();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
 
         self::$fixture->performTearDown();
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_construct_shouldFailInCaseOfEmptyScope()
     {
+        $this->expectException(\Exception::class);
+
         new Model(null);
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_construct_shouldFailInCaseOfInvalidScope()
     {
+        $this->expectException(\Exception::class);
+
         new Model('inValId');
     }