diff --git a/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php b/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php
index d7e6ef153ab62be3ab202bab76e3e6b229239613..78e15b5a23a1789deb878adbb404999f4117304b 100644
--- a/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php
+++ b/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php
@@ -6,8 +6,8 @@ require_once(__DIR__.'/../../../SigningTestCase.php');
 
 use PHPUnit\Framework\TestCase;
 use RobRichards\XMLSecLibs\XMLSecurityDSig;
-use \SimpleSAML\XML\Signer;
-use \SimpleSAML\Metadata\SAMLParser;
+use SimpleSAML\XML\Signer;
+use SimpleSAML\Metadata\SAMLParser;
 
 /**
  * Test SAML parsing
@@ -173,6 +173,8 @@ XML
 
 
     /**
+     * @param string $algo
+     * @param string $expected_fingerprint
      * @return void
      */
     public function _testValidateFingerprint($algo, $expected_fingerprint)
diff --git a/tests/lib/SimpleSAML/Store/RedisTest.php b/tests/lib/SimpleSAML/Store/RedisTest.php
index cc59a69b71f17d27444866f37b77994a3eadf11d..db6f31cdd1d309b8810907714771f51130222ba9 100644
--- a/tests/lib/SimpleSAML/Store/RedisTest.php
+++ b/tests/lib/SimpleSAML/Store/RedisTest.php
@@ -3,8 +3,8 @@
 namespace SimpleSAML\Test\Store;
 
 use PHPUnit\Framework\TestCase;
-use \SimpleSAML\Configuration;
-use \SimpleSAML\Store;
+use SimpleSAML\Configuration;
+use SimpleSAML\Store;
 
 /**
  * Tests for the Redis store.
@@ -52,7 +52,8 @@ class RedisTest extends TestCase
 
 
     /**
-     * @return \Predis\Client 
+     * @param string $key
+     * @return \Predis\Client
      */
     public function getMocked($key)
     {
@@ -61,6 +62,8 @@ class RedisTest extends TestCase
 
 
     /**
+     * @param string $key
+     * @param mixed $value
      * @return void
      */
     public function setMocked($key, $value)
@@ -70,6 +73,9 @@ class RedisTest extends TestCase
 
 
     /**
+     * @param string $key
+     * @param int $expire
+     * @param mixed $value
      * @return void
      */
     public function setexMocked($key, $expire, $value)
@@ -80,6 +86,7 @@ class RedisTest extends TestCase
 
 
     /**
+     * @param string $key
      * @return void
      */
     public function delMocked($key)
@@ -220,6 +227,8 @@ class RedisTest extends TestCase
 
 
     /**
+     * @param \SimpleSAML\Configuration|\SimpleSAML\Store $service
+     * @param string $className
      * @return void
      */
     protected function clearInstance($service, $className)
diff --git a/tests/lib/SimpleSAML/Store/SQLTest.php b/tests/lib/SimpleSAML/Store/SQLTest.php
index f9545575cc74b081fa274f98ce270e9ea09cac97..bff22681a521683e309f737ff01830f7e9d7c937 100644
--- a/tests/lib/SimpleSAML/Store/SQLTest.php
+++ b/tests/lib/SimpleSAML/Store/SQLTest.php
@@ -3,8 +3,8 @@
 namespace SimpleSAML\Test\Store;
 
 use PHPUnit\Framework\TestCase;
-use \SimpleSAML\Configuration;
-use \SimpleSAML\Store;
+use SimpleSAML\Configuration;
+use SimpleSAML\Store;
 
 /**
  * Tests for the SQL store.
@@ -207,6 +207,8 @@ class SQLTest extends TestCase
 
 
     /**
+     * @param \SimpleSAML\Configuration|\SimpleSAML\Store $service
+     * @param string $className
      * @return void
      */
     protected function clearInstance($service, $className)
diff --git a/tests/lib/SimpleSAML/StoreTest.php b/tests/lib/SimpleSAML/StoreTest.php
index 0b12b96574baa20107949005714cb695eb412d57..756a53382cf0785d00d99395c28f3cacc1729341 100644
--- a/tests/lib/SimpleSAML/StoreTest.php
+++ b/tests/lib/SimpleSAML/StoreTest.php
@@ -138,6 +138,8 @@ class StoreTest extends TestCase
 
 
     /**
+     * @param \SimpleSAML\Configuration|\SimpleSAML\Store $service
+     * @param string $className
      * @return void
      */
     protected function clearInstance($service, $className)
diff --git a/tests/lib/SimpleSAML/Utils/EMailTestCase.php b/tests/lib/SimpleSAML/Utils/EMailTestCase.php
index be6fe955d0b3e78f93c78d1b073e1ae6a5a29dea..a79a60e0386ff7a00a15269fc68d6fe9730a65a6 100644
--- a/tests/lib/SimpleSAML/Utils/EMailTestCase.php
+++ b/tests/lib/SimpleSAML/Utils/EMailTestCase.php
@@ -63,6 +63,7 @@ class EMailTestCase extends ClearStateTestCase
     /**
      * Test that the data given is visible in the resulting mail
      * @dataProvider mailTemplates
+     * @param string $template
      * @return void
      */
     public function testMailContents($template)
diff --git a/tests/lib/SimpleSAML/Utils/SystemTest.php b/tests/lib/SimpleSAML/Utils/SystemTest.php
index e64ef4d8acb8b414da95ac0fd873849a0861afc8..8b98c63008a58a6c26a4b9bbbe37379baf6e4122 100644
--- a/tests/lib/SimpleSAML/Utils/SystemTest.php
+++ b/tests/lib/SimpleSAML/Utils/SystemTest.php
@@ -296,6 +296,7 @@ class SystemTest extends TestCase
 
 
     /**
+     * @param string $directory
      * @return \SimpleSAML\Configuration
      */
     private function setConfigurationTempDir($directory)
@@ -309,9 +310,11 @@ class SystemTest extends TestCase
 
 
     /**
+     * @param \SimpleSAML\Configuration $service
+     * @param string $className
      * @return void
      */
-    protected function clearInstance($service, $className)
+    protected function clearInstance(Configuration $service, $className)
     {
         $reflectedClass = new \ReflectionClass($className);
         $reflectedInstance = $reflectedClass->getProperty('instance');
diff --git a/tests/lib/SimpleSAML/XML/SignerTest.php b/tests/lib/SimpleSAML/XML/SignerTest.php
index 70c4f1faa8a50f4f54df6ad386a29b54e8536b65..82b56876cde759f5f8787516d17ffcacc17298ac 100644
--- a/tests/lib/SimpleSAML/XML/SignerTest.php
+++ b/tests/lib/SimpleSAML/XML/SignerTest.php
@@ -5,9 +5,9 @@ namespace SimpleSAML\Test\XML;
 require_once(__DIR__.'/../../../SigningTestCase.php');
 
 use PHPUnit\Framework\TestCase;
-use \SimpleSAML\Configuration;
-use \SimpleSAML\Test\SigningTestCase;
-use \SimpleSAML\XML\Signer;
+use SimpleSAML\Configuration;
+use SimpleSAML\Test\SigningTestCase;
+use SimpleSAML\XML\Signer;
 
 use \org\bovigo\vfs\vfsStream;
 
@@ -96,6 +96,7 @@ NOWDOC;
 
 
     /**
+     * @param string $certificate
      * @return string
      */
     private static function getCertificateValue($certificate)
@@ -187,9 +188,12 @@ NOWDOC;
 
 
     /**
+     * @param \SimpleSAML\Configuration $service
+     * @param string $className
+     * @param mixed|null $value
      * @return void
      */
-    protected function clearInstance($service, $className, $value = null)
+    protected function clearInstance(Configuration $service, $className, $value = null)
     {
         $reflectedClass = new \ReflectionClass($className);
         $reflectedInstance = $reflectedClass->getProperty('instance');
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 aed55681f96895f0f2d2fa085345527ae241d1d1..29549d28370fbc4c73e75cd5fa93ab92e6a71674 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
@@ -20,9 +20,10 @@ class ExitTestException extends \Exception
 
 
     /**
+     * @param array $testResult
      * @return void
      */
-    public function __construct($testResult)
+    public function __construct(array $testResult)
     {
         parent::__construct("ExitTestException", 0, null);
         $this->testResult = $testResult;
@@ -47,6 +48,8 @@ class ExitTestException extends \Exception
 class SPTester extends \SimpleSAML\Module\saml\Auth\Source\SP
 {
     /**
+     * @param array $info
+     * @param array $config
      * @return void
      */
     public function __construct($info, $config)
diff --git a/tests/www/IndexTest.php b/tests/www/IndexTest.php
index e0da79a34025a42fc6fa173e56ea92ff56c71e60..7d082b7015b3f11b6c75e2422017fde025713462 100644
--- a/tests/www/IndexTest.php
+++ b/tests/www/IndexTest.php
@@ -55,9 +55,10 @@ class IndexTest extends TestCase
 
 
     /**
+     * @param array $config
      * @return void
      */
-    protected function updateConfig($config)
+    protected function updateConfig(array $config)
     {
         @unlink($this->shared_file);
         $config = "<?php\n\$config = ".var_export($config, true).";\n";