diff --git a/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php b/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php
index 533bb9f1187e1e52646e847376598416cf65d48e..7983886287b407da92412050b390d87a09f42a5e 100644
--- a/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php
+++ b/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php
@@ -2,15 +2,10 @@
 
 namespace SimpleSAML\Test\Module\core\Auth\Process;
 
-// Alias the PHPUnit 6.0 ancestor if available, else fall back to legacy ancestor
-if (class_exists('\PHPUnit\Framework\TestCase', true) and !class_exists('\PHPUnit_Framework_TestCase', true)) {
-    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase', true);
-}
-
 /**
  * Test for the core:CardinalitySingle filter.
  */
-class CardinalitySingleTest extends \PHPUnit_Framework_TestCase
+class CardinalitySingleTest extends \PHPUnit\Framework\TestCase
 {
     private $http;
 
diff --git a/tests/modules/core/lib/Auth/Process/CardinalityTest.php b/tests/modules/core/lib/Auth/Process/CardinalityTest.php
index 5f3302c1be92af17bc415a432b2c359f95a3c373..5083383673c792c00ce00d2eec0a8ee9394f7cfc 100644
--- a/tests/modules/core/lib/Auth/Process/CardinalityTest.php
+++ b/tests/modules/core/lib/Auth/Process/CardinalityTest.php
@@ -2,15 +2,10 @@
 
 namespace SimpleSAML\Test\Module\core\Auth\Process;
 
-// Alias the PHPUnit 6.0 ancestor if available, else fall back to legacy ancestor
-if (class_exists('\PHPUnit\Framework\TestCase', true) and !class_exists('\PHPUnit_Framework_TestCase', true)) {
-    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase', true);
-}
-
 /**
  * Test for the core:Cardinality filter.
  */
-class CardinalityTest extends \PHPUnit_Framework_TestCase
+class CardinalityTest extends \PHPUnit\Framework\TestCase
 {
     private $http;
 
diff --git a/tests/modules/core/lib/Auth/UserPassBaseTest.php b/tests/modules/core/lib/Auth/UserPassBaseTest.php
index 242ff79dbb9d41b936dbb13c267312fbd4c98fa9..a6715df988f00a342288d358ee1139c699ad7a75 100644
--- a/tests/modules/core/lib/Auth/UserPassBaseTest.php
+++ b/tests/modules/core/lib/Auth/UserPassBaseTest.php
@@ -2,7 +2,7 @@
 
 namespace SimpleSAML\Test\Module\core\Auth;
 
-class UserPassBaseTest extends \PHPUnit_Framework_TestCase
+class UserPassBaseTest extends \PHPUnit\Framework\TestCase
 {
     public function testAuthenticateECPCallsLoginAndSetsAttributes()
     {
diff --git a/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php b/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
index 7db0605b0679f534d9ea46d0a1c38db81d663e14..e3a091cefc132a5aca0ea91bbff73f8952368f20 100644
--- a/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
+++ b/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
@@ -4,7 +4,7 @@ namespace SimpleSAML\Test\Module\core\Auth;
 
 use SimpleSAML\Module\core\Auth\UserPassOrgBase;
 
-class UserPassOrgBaseTest extends \PHPUnit_Framework_TestCase
+class UserPassOrgBaseTest extends \PHPUnit\Framework\TestCase
 {
     public function testRememberOrganizationEnabled()
     {
diff --git a/tests/www/RouterTest.php b/tests/www/RouterTest.php
index 70c73ce9299c30c1d01b3963ae481153a15cf2a0..d653b1b1d6d824e6f571fba2cd5a311530148d20 100644
--- a/tests/www/RouterTest.php
+++ b/tests/www/RouterTest.php
@@ -3,6 +3,7 @@
 namespace SimpleSAML\Test\Web;
 
 use Symfony\Component\Yaml\Parser;
+use Symfony\Component\Yaml\Exception\ParseException;
 use PHPUnit\Framework\TestCase;
 use \SimpleSAML\Configuration;
 use \SimpleSAML\Module;
@@ -28,7 +29,7 @@ class RouterTest extends TestCase
                         try {
                             $value = $yaml->parse(file_get_contents('modules/'.$module.'/'.$file));
                             $this->addToAssertionCount(1);
-                        } catch (\ParseException $e) {
+                        } catch (ParseException $e) {
                             $this->fail($e->getMessage().' in '.$e->getFile().':'.$e->getLine());
                         }
                     }