diff --git a/lib/classes/component.php b/lib/classes/component.php
index dd20258e24e..63148d92073 100644
--- a/lib/classes/component.php
+++ b/lib/classes/component.php
@@ -480,7 +480,7 @@ $cache = '.var_export($cache, true).';
             'tag'         => $CFG->dirroot.'/tag',
             'timezones'   => null,
             'user'        => $CFG->dirroot.'/user',
-            'userkey'     => null,
+            'userkey'     => $CFG->dirroot.'/lib/userkey',
             'webservice'  => $CFG->dirroot.'/webservice',
         );
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d16e4492998..1459d5311d2 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -125,6 +125,9 @@
         <testsuite name="core_repository_testsuite">
             <directory suffix="_test.php">repository/tests</directory>
         </testsuite>
+        <testsuite name="core_userkey_testsuite">
+            <directory suffix="_test.php">lib/userkey/tests</directory>
+        </testsuite>
         <testsuite name="core_user_testsuite">
             <directory suffix="_test.php">user/tests</directory>
         </testsuite>