diff --git a/tests/auth_plugin_test.php b/tests/phpunit/auth_plugin_test.php
similarity index 99%
rename from tests/auth_plugin_test.php
rename to tests/phpunit/auth_plugin_test.php
index 98e9606..7b44476 100644
--- a/tests/auth_plugin_test.php
+++ b/tests/phpunit/auth_plugin_test.php
@@ -50,7 +50,7 @@ class auth_plugin_userkey_testcase extends advanced_testcase {
         global $CFG;
 
         require_once($CFG->libdir . "/externallib.php");
-        require_once($CFG->dirroot . '/auth/userkey/tests/fake_userkey_manager.php');
+        require_once($CFG->dirroot . '/auth/userkey/tests/phpunit/fake_userkey_manager.php');
         require_once($CFG->dirroot . '/auth/userkey/auth.php');
         require_once($CFG->dirroot . '/user/lib.php');
 
diff --git a/tests/core_userkey_manager_test.php b/tests/phpunit/core_userkey_manager_test.php
similarity index 100%
rename from tests/core_userkey_manager_test.php
rename to tests/phpunit/core_userkey_manager_test.php
diff --git a/tests/externallib_test.php b/tests/phpunit/externallib_test.php
similarity index 100%
rename from tests/externallib_test.php
rename to tests/phpunit/externallib_test.php
diff --git a/tests/fake_userkey_manager.php b/tests/phpunit/fake_userkey_manager.php
similarity index 100%
rename from tests/fake_userkey_manager.php
rename to tests/phpunit/fake_userkey_manager.php