diff --git a/tests/lib/AutoloadModulesTest.php b/tests/lib/AutoloadModulesTest.php
index c136ea5ea6366904a7dfc59ec873e673a176da9c..add217d60fe358bc9638acfc0c40404edf83bd78 100644
--- a/tests/lib/AutoloadModulesTest.php
+++ b/tests/lib/AutoloadModulesTest.php
@@ -18,7 +18,6 @@ class AutoloadModulesTest extends TestCase
     }
 
     /**
-     * @test
      * @runInSeparateProcess
      * @return void
      */
@@ -28,7 +27,6 @@ class AutoloadModulesTest extends TestCase
     }
 
     /**
-     * @test
      * @return void
      */
     public function autoloaderSubstitutesNamespacedXmlSecClassesWhereNonNamespacedClassWasUsed()
diff --git a/tests/lib/SimpleSAML/Auth/SimpleTest.php b/tests/lib/SimpleSAML/Auth/SimpleTest.php
index 7e5799634165577e75e7d482ffd1311fe9503aa6..048e43aa7d19631b9b658ef3b0cd8858f4133a73 100644
--- a/tests/lib/SimpleSAML/Auth/SimpleTest.php
+++ b/tests/lib/SimpleSAML/Auth/SimpleTest.php
@@ -9,7 +9,6 @@ namespace SimpleSAML\Test\Auth;
 class SimpleTest extends \SimpleSAML\Test\Utils\ClearStateTestCase
 {
     /**
-     * @test
      * @return void
      */
     public function testGetProcessedURL()
diff --git a/tests/lib/SimpleSAML/DatabaseTest.php b/tests/lib/SimpleSAML/DatabaseTest.php
index 6ba5c9bf6a577c526dc6a2b23ca7cb90dccacb55..5957e08d2ece6168c60379534e4a7520bf599de7 100644
--- a/tests/lib/SimpleSAML/DatabaseTest.php
+++ b/tests/lib/SimpleSAML/DatabaseTest.php
@@ -80,7 +80,6 @@ class DatabaseTest extends TestCase
      * @covers SimpleSAML\Database::generateInstanceId
      * @covers SimpleSAML\Database::__construct
      * @covers SimpleSAML\Database::connect
-     * @test
      * @return void
      */
     public function connectionFailure()
@@ -105,7 +104,6 @@ class DatabaseTest extends TestCase
      * @covers SimpleSAML\Database::generateInstanceId
      * @covers SimpleSAML\Database::__construct
      * @covers SimpleSAML\Database::connect
-     * @test
      * @return void
      */
     public function instances()
@@ -175,7 +173,6 @@ class DatabaseTest extends TestCase
      * @covers SimpleSAML\Database::__construct
      * @covers SimpleSAML\Database::connect
      * @covers SimpleSAML\Database::getSlave
-     * @test
      * @return void
      */
     public function slaves()
@@ -218,7 +215,6 @@ class DatabaseTest extends TestCase
 
     /**
      * @covers SimpleSAML\Database::applyPrefix
-     * @test
      * @return void
      */
     public function prefix()
@@ -236,7 +232,6 @@ class DatabaseTest extends TestCase
      * @covers SimpleSAML\Database::read
      * @covers SimpleSAML\Database::exec
      * @covers SimpleSAML\Database::query
-     * @test
      * @return void
      */
     public function querying()
@@ -269,7 +264,6 @@ class DatabaseTest extends TestCase
     /**
      * @covers SimpleSAML\Database::read
      * @covers SimpleSAML\Database::query
-     * @test
      * @return void
      */
     public function readFailure()
@@ -285,7 +279,6 @@ class DatabaseTest extends TestCase
     /**
      * @covers SimpleSAML\Database::write
      * @covers SimpleSAML\Database::exec
-     * @test
      * @return void
      */
     public function noSuchTable()
diff --git a/tests/lib/SimpleSAML/Store/RedisTest.php b/tests/lib/SimpleSAML/Store/RedisTest.php
index db6f31cdd1d309b8810907714771f51130222ba9..375aba6b8bfb55a48843a2a69c451f7ab21f50f1 100644
--- a/tests/lib/SimpleSAML/Store/RedisTest.php
+++ b/tests/lib/SimpleSAML/Store/RedisTest.php
@@ -98,7 +98,6 @@ class RedisTest extends TestCase
     /**
      * @covers \SimpleSAML\Store::getInstance
      * @covers \SimpleSAML\Store\Redis::__construct
-     * @test
      * @return void
      */
     public function testRedisInstance()
@@ -120,7 +119,6 @@ class RedisTest extends TestCase
     /**
      * @covers \SimpleSAML\Store::getInstance
      * @covers \SimpleSAML\Store\Redis::__construct
-     * @test
      * @return void
      */
     public function testRedisInstanceWithPassword()
@@ -143,7 +141,6 @@ class RedisTest extends TestCase
     /**
      * @covers \SimpleSAML\Store\Redis::get
      * @covers \SimpleSAML\Store\Redis::set
-     * @test
      * @return void
      */
     public function testInsertData()
@@ -161,7 +158,6 @@ class RedisTest extends TestCase
     /**
      * @covers \SimpleSAML\Store\Redis::get
      * @covers \SimpleSAML\Store\Redis::set
-     * @test
      * @return void
      */
     public function testInsertExpiringData()
@@ -178,7 +174,6 @@ class RedisTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store\Redis::get
-     * @test
      * @return void
      */
     public function testGetEmptyData()
@@ -192,7 +187,6 @@ class RedisTest extends TestCase
     /**
      * @covers \SimpleSAML\Store\Redis::get
      * @covers \SimpleSAML\Store\Redis::set
-     * @test
      * @return void
      */
     public function testOverwriteData()
@@ -213,7 +207,6 @@ class RedisTest extends TestCase
      * @covers \SimpleSAML\Store\Redis::get
      * @covers \SimpleSAML\Store\Redis::set
      * @covers \SimpleSAML\Store\Redis::delete
-     * @test
      * @return void
      */
     public function testDeleteData()
diff --git a/tests/lib/SimpleSAML/Store/SQLTest.php b/tests/lib/SimpleSAML/Store/SQLTest.php
index bff22681a521683e309f737ff01830f7e9d7c937..bc864dc783af602887ff170298b107e4c81558e6 100644
--- a/tests/lib/SimpleSAML/Store/SQLTest.php
+++ b/tests/lib/SimpleSAML/Store/SQLTest.php
@@ -33,7 +33,6 @@ class SQLTest extends TestCase
     /**
      * @covers \SimpleSAML\Store::getInstance
      * @covers \SimpleSAML\Store\SQL::__construct
-     * @test
      * @return void
      */
     public function SQLInstance()
@@ -47,7 +46,6 @@ class SQLTest extends TestCase
     /**
      * @covers \SimpleSAML\Store\SQL::initTableVersionTable
      * @covers \SimpleSAML\Store\SQL::initKVTable
-     * @test
      * @return void
      */
     public function kvstoreTableVersion()
@@ -63,7 +61,6 @@ class SQLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store\SQL::getTableVersion
-     * @test
      * @return void
      */
     public function newTableVersion()
@@ -80,7 +77,6 @@ class SQLTest extends TestCase
     /**
      * @covers \SimpleSAML\Store\SQL::setTableVersion
      * @covers \SimpleSAML\Store\SQL::insertOrUpdate
-     * @test
      * @return void
      */
     public function testSetTableVersion()
@@ -97,7 +93,6 @@ class SQLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store\SQL::get
-     * @test
      * @return void
      */
     public function testGetEmptyData()
@@ -115,7 +110,6 @@ class SQLTest extends TestCase
      * @covers \SimpleSAML\Store\SQL::get
      * @covers \SimpleSAML\Store\SQL::set
      * @covers \SimpleSAML\Store\SQL::insertOrUpdate
-     * @test
      * @return void
      */
     public function testInsertData()
@@ -134,7 +128,6 @@ class SQLTest extends TestCase
      * @covers \SimpleSAML\Store\SQL::get
      * @covers \SimpleSAML\Store\SQL::set
      * @covers \SimpleSAML\Store\SQL::insertOrUpdate
-     * @test
      * @return void
      */
     public function testOverwriteData()
@@ -155,7 +148,6 @@ class SQLTest extends TestCase
      * @covers \SimpleSAML\Store\SQL::set
      * @covers \SimpleSAML\Store\SQL::insertOrUpdate
      * @covers \SimpleSAML\Store\SQL::delete
-     * @test
      * @return void
      */
     public function testDeleteData()
@@ -176,7 +168,6 @@ class SQLTest extends TestCase
      * @covers \SimpleSAML\Store\SQL::set
      * @covers \SimpleSAML\Store\SQL::insertOrUpdate
      * @covers \SimpleSAML\Store\SQL::delete
-     * @test
      * @return void
      */
     public function testVeryLongKey()
diff --git a/tests/lib/SimpleSAML/StoreTest.php b/tests/lib/SimpleSAML/StoreTest.php
index 756a53382cf0785d00d99395c28f3cacc1729341..7704fa210a25d2290cf7c364d4331cb302199401 100644
--- a/tests/lib/SimpleSAML/StoreTest.php
+++ b/tests/lib/SimpleSAML/StoreTest.php
@@ -21,7 +21,6 @@ class StoreTest extends TestCase
 {
     /**
      * @covers \SimpleSAML\Store::getInstance
-     * @test
      * @return void
      */
     public function defaultStore()
@@ -37,7 +36,6 @@ class StoreTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store::getInstance
-     * @test
      * @return void
      */
     public function phpSessionStore()
@@ -53,7 +51,6 @@ class StoreTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store::getInstance
-     * @test
      * @return void
      */
     public function memcacheStore()
@@ -70,7 +67,6 @@ class StoreTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store::getInstance
-     * @test
      * @return void
      */
     public function sqlStore()
@@ -89,7 +85,6 @@ class StoreTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store::getInstance
-     * @test
      * @return void
      */
     public function pathStore()
@@ -108,7 +103,6 @@ class StoreTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Store::getInstance
-     * @test
      * @return void
      */
     public function notFoundStoreException()
diff --git a/tests/lib/SimpleSAML/Utils/SystemTest.php b/tests/lib/SimpleSAML/Utils/SystemTest.php
index 9f73b88fd45a2804a87902c4abca85d587b3c817..2b9920d2614077292ff6d75224ad88f0fb36e78c 100644
--- a/tests/lib/SimpleSAML/Utils/SystemTest.php
+++ b/tests/lib/SimpleSAML/Utils/SystemTest.php
@@ -36,7 +36,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::getOS
-     * @test
      * @return void
      */
     public function testGetOSBasic()
@@ -49,7 +48,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::resolvePath
-     * @test
      * @return void
      */
     public function testResolvePathRemoveTrailingSlashes()
@@ -66,7 +64,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::resolvePath
-     * @test
      * @return void
      */
     public function testResolvePathPreferAbsolutePathToBase()
@@ -83,7 +80,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::resolvePath
-     * @test
      * @return void
      */
     public function testResolvePathCurDirPath()
@@ -100,7 +96,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::resolvePath
-     * @test
      * @return void
      */
     public function testResolvePathParentPath()
@@ -117,7 +112,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::resolvePath
-     * @test
      * @return void
      */
     public function testResolvePathAllowsStreamWrappers()
@@ -134,7 +128,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::resolvePath
-     * @test
      * @return void
      */
     public function testResolvePathAllowsAwsS3StreamWrappers()
@@ -151,7 +144,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::writeFile
-     * @test
      * @deprecated Test becomes obsolete as soon as the codebase is fully type hinted
      * @return void
      */
@@ -165,7 +157,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::writeFile
-     * @test
      * @return void
      */
     public function testWriteFileBasic()
@@ -185,7 +176,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::writeFile
-     * @test
      * @return void
      */
     public function testWriteFileContents()
@@ -209,7 +199,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::writeFile
-     * @test
      * @return void
      */
     public function testWriteFileMode()
@@ -233,7 +222,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::getTempDir
-     * @test
      * @return void
      */
     public function testGetTempDirBasic()
@@ -253,7 +241,6 @@ class SystemTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\System::getTempDir
-     * @test
      * @return void
      */
     public function testGetTempDirNonExistant()
@@ -274,7 +261,6 @@ class SystemTest extends TestCase
     /**
      * @requires OS Linux
      * @covers \SimpleSAML\Utils\System::getTempDir
-     * @test
      * @return void
      */
     public function testGetTempDirBadOwner()
diff --git a/tests/lib/SimpleSAML/Utils/XMLTest.php b/tests/lib/SimpleSAML/Utils/XMLTest.php
index 938f4ef38587fc8fe4751e8876ec5457621d2211..db2953984856e36aed9fe80fda0b2f9f1fb188c4 100644
--- a/tests/lib/SimpleSAML/Utils/XMLTest.php
+++ b/tests/lib/SimpleSAML/Utils/XMLTest.php
@@ -14,7 +14,6 @@ class XMLTest extends TestCase
 {
     /**
      * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
-     * @test
      * @return void
      */
     public function testIsDomNodeOfTypeBasic()
@@ -31,7 +30,6 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
-     * @test
      * @return void
      */
     public function testIsDomNodeOfTypeMissingNamespace()
@@ -47,7 +45,6 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
-     * @test
      * @return void
      */
     public function testIsDomNodeOfTypeEmpty()
@@ -64,7 +61,6 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
-     * @test
      * @return void
      */
     public function testIsDomNodeOfTypeShortcut()
@@ -82,7 +78,6 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
-     * @test
      * @return void
      */
     public function testIsDomNodeOfTypeIncorrectName()
@@ -100,7 +95,6 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
-     * @test
      * @return void
      */
     public function testIsDomNodeOfTypeIncorrectNamespace()
@@ -118,7 +112,6 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::getDOMText
-     * @test
      * @return void
      */
     public function testGetDomTextBasic()
@@ -137,7 +130,6 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::getDOMText
-     * @test
      * @return void
      */
     public function testGetDomTextMulti()
@@ -158,7 +150,6 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::getDOMText
-     * @test
      * @return void
      */
     public function testGetDomTextIncorrectType()
@@ -174,7 +165,6 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::getDOMChildren
-     * @test
      * @return void
      */
     public function testGetDomChildrenBasic()
@@ -194,7 +184,6 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::getDOMChildren
-     * @test
      * @return void
      */
     public function testGetDomChildrenIncorrectType()
@@ -213,7 +202,6 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::getDOMChildren
-     * @test
      * @return void
      */
     public function testGetDomChildrenIncorrectName()
@@ -233,7 +221,6 @@ class XMLTest extends TestCase
 
     /**
      * @covers \SimpleSAML\Utils\XML::formatDOMElement
-     * @test
      * @return void
      */
     public function testFormatDomElementBasic()
@@ -257,7 +244,6 @@ NOWDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::formatDOMElement
-     * @test
      * @return void
      */
     public function testFormatDomElementNested()
@@ -285,7 +271,6 @@ NOWDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::formatDOMElement
-     * @test
      * @return void
      */
     public function testFormatDomElementIndentBase()
@@ -314,7 +299,6 @@ HEREDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::formatDOMElement
-     * @test
      * @return void
      */
     public function testFormatDomElementTextAndChild()
@@ -339,7 +323,6 @@ HEREDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::formatXMLString
-     * @test
      * @return void
      */
     public function testFormatXmlStringBasic()
@@ -359,7 +342,6 @@ NOWDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::formatXMLString
-     * @test
      * @return void
      */
     public function testFormatXmlStringMalformedXml()
@@ -373,7 +355,6 @@ NOWDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::isValid
-     * @test
      * @return void
      */
     public function testIsValidMalformedXml()
@@ -389,7 +370,6 @@ NOWDOC;
 
     /**
      * @covers \SimpleSAML\Utils\XML::isValid
-     * @test
      * @return void
      */
     public function testIsValidMetadata()
diff --git a/tests/lib/SimpleSAML/XML/ErrorsTest.php b/tests/lib/SimpleSAML/XML/ErrorsTest.php
index c671a23e1190c23dff05db877d3fd284eec1d733..824f14a5a5457e378a7308c42bcbc91a5206e198 100644
--- a/tests/lib/SimpleSAML/XML/ErrorsTest.php
+++ b/tests/lib/SimpleSAML/XML/ErrorsTest.php
@@ -20,7 +20,6 @@ class ErrorsTest extends TestCase
      * @covers \SimpleSAML\XML\Errors::begin
      * @covers \SimpleSAML\XML\Errors::addErrors
      * @covers \SimpleSAML\XML\Errors::end
-     * @test
      * @return void
      */
     public function loggingErrors()
@@ -41,7 +40,6 @@ class ErrorsTest extends TestCase
     /**
      * @covers \SimpleSAML\XML\Errors::formatError
      * @covers \SimpleSAML\XML\Errors::formatErrors
-     * @test
      * @return void
      */
     public function formatErrors()
diff --git a/tests/lib/SimpleSAML/XML/ParserTest.php b/tests/lib/SimpleSAML/XML/ParserTest.php
index 35bc70c41bdfee889c9c8fafc0b5a0988bf5ffc0..ede4800f63ec0d5c2393b1c7cde2ca0f7307d92a 100644
--- a/tests/lib/SimpleSAML/XML/ParserTest.php
+++ b/tests/lib/SimpleSAML/XML/ParserTest.php
@@ -38,7 +38,6 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValue
      * @covers \SimpleSAML\XML\Parser::__construct
-     * @test
      * @return void
      */
     public function getValue()
@@ -54,7 +53,6 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValue
      * @covers \SimpleSAML\XML\Parser::__construct
-     * @test
      * @return void
      */
     public function getEmptyValue()
@@ -70,7 +68,6 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValue
      * @covers \SimpleSAML\XML\Parser::__construct
-     * @test
      * @return void
      */
     public function getValueException()
@@ -83,7 +80,6 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValueDefault
      * @covers \SimpleSAML\XML\Parser::__construct
-     * @test
      * @return void
      */
     public function getDefaultValue()
@@ -99,7 +95,6 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValueAlternatives
      * @covers \SimpleSAML\XML\Parser::__construct
-     * @test
      * @return void
      */
     public function getValueAlternatives()
@@ -122,7 +117,6 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValueAlternatives
      * @covers \SimpleSAML\XML\Parser::__construct
-     * @test
      * @return void
      */
     public function getEmptyValueAlternatives()
@@ -145,7 +139,6 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Parser::getValueAlternatives
      * @covers \SimpleSAML\XML\Parser::__construct
-     * @test
      * @return void
      */
     public function getValueAlternativesException()
diff --git a/tests/lib/SimpleSAML/XML/Shib13/AuthnResponseTest.php b/tests/lib/SimpleSAML/XML/Shib13/AuthnResponseTest.php
index 1bc2c4af9fe909c22c90e70388829bdefcff2b10..6a5ba0f53486e07af0860ed2788902ae9ce07746 100644
--- a/tests/lib/SimpleSAML/XML/Shib13/AuthnResponseTest.php
+++ b/tests/lib/SimpleSAML/XML/Shib13/AuthnResponseTest.php
@@ -67,7 +67,6 @@ XML;
 
     /**
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::setXML
-     * @test
      * @return void
      */
     public function setXML()
@@ -81,7 +80,6 @@ XML;
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::doXPathQuery
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::getIssuer
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::setXML
-     * @test
      * @return void
      */
     public function getIssuer()
@@ -98,7 +96,6 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::getIssuer
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::setXML
-     * @test
      * @return void
      */
     public function getIssuerException()
@@ -114,7 +111,6 @@ XML;
     /**
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::getNameID
      * @covers \SimpleSAML\XML\Shib13\AuthnResponse::setXML
-     * @test
      * @return void
      */
     public function getNameID()
diff --git a/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php b/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php
index 29549d28370fbc4c73e75cd5fa93ab92e6a71674..fc89f7c78e6221294b0064db12f92b3f49a2d138 100644
--- a/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php
+++ b/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php
@@ -187,7 +187,6 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test generating an AuthnRequest
-     * @test
      * @return void
      */
     public function testAuthnRequest()
@@ -213,7 +212,6 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test setting a Subject
-     * @test
      * @return void
      */
     public function testNameID()
@@ -246,7 +244,6 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test setting an AuthnConextClassRef
-     * @test
      * @return void
      */
     public function testAuthnContextClassRef()
@@ -276,7 +273,6 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test setting ForcedAuthn
-     * @test
      * @return void
      */
     public function testForcedAuthn()