diff --git a/tests/base_testcase.php b/tests/base_testcase.php
index cc79c0d..1976ad2 100644
--- a/tests/base_testcase.php
+++ b/tests/base_testcase.php
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace auth_outage;
-
 use auth_outage\dml\outagedb;
 use auth_outage\local\outage;
 
diff --git a/tests/calendar/calendar_test.php b/tests/calendar/calendar_test.php
index bc55123..74afa73 100644
--- a/tests/calendar/calendar_test.php
+++ b/tests/calendar/calendar_test.php
@@ -23,9 +23,8 @@
  * @license         http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace auth_outage\calendar;
-
 use auth_outage\local\outage;
+use auth_outage\calendar\calendar;
 
 /**
  * calendar_test test class.
diff --git a/tests/dml/events_test.php b/tests/dml/events_test.php
index c65d144..f810353 100644
--- a/tests/dml/events_test.php
+++ b/tests/dml/events_test.php
@@ -23,9 +23,8 @@
  * @license         http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace auth_outage\dml;
-
 use auth_outage\local\outage;
+use auth_outage\dml\outagedb;
 
 /**
  * events_test tests class.
diff --git a/tests/dml/installation_test.php b/tests/dml/installation_test.php
index 8646788..fecad0f 100644
--- a/tests/dml/installation_test.php
+++ b/tests/dml/installation_test.php
@@ -25,9 +25,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace auth_outage\dml;
-
 use auth_outage\local\outage;
+use auth_outage\dml\outagedb;
 
 defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__.'/../base_testcase.php');
diff --git a/tests/dml/outagedb_test.php b/tests/dml/outagedb_test.php
index 31c4d59..df60cbc 100644
--- a/tests/dml/outagedb_test.php
+++ b/tests/dml/outagedb_test.php
@@ -23,9 +23,8 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace auth_outage\dml;
-
 use auth_outage\local\outage;
+use auth_outage\dml\outagedb;
 
 defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__.'/../base_testcase.php');
diff --git a/tests/form/outage/forms_test.php b/tests/form/outage/forms_test.php
index 250475a..f7ed590 100644
--- a/tests/form/outage/forms_test.php
+++ b/tests/form/outage/forms_test.php
@@ -23,9 +23,10 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace auth_outage\form\outage;
-
 use auth_outage\local\outage;
+use auth_outage\form\outage\delete;
+use auth_outage\form\outage\finish;
+use auth_outage\form\outage\edit;
 
 defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__.'/../../base_testcase.php');
diff --git a/tests/lib_test.php b/tests/lib_test.php
index 0c08a25..286f34c 100644
--- a/tests/lib_test.php
+++ b/tests/lib_test.php
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace auth_outage;
-
 defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__.'/base_testcase.php');
 require_once(__DIR__.'/../lib.php');
diff --git a/tests/local/cli/cli_test.php b/tests/local/cli/cli_test.php
index 6fedc4f..d821e74 100644
--- a/tests/local/cli/cli_test.php
+++ b/tests/local/cli/cli_test.php
@@ -23,7 +23,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace auth_outage\local\cli;
+use auth_outage\local\cli\cli_exception;
+use auth_outage\local\cli\create;
 
 defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__.'/cli_testcase.php');
diff --git a/tests/local/cli/cli_testcase.php b/tests/local/cli/cli_testcase.php
index 9b6c669..e9cec6f 100644
--- a/tests/local/cli/cli_testcase.php
+++ b/tests/local/cli/cli_testcase.php
@@ -23,8 +23,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace auth_outage\local\cli;
-
 defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__.'/../../base_testcase.php');
 
@@ -78,7 +76,7 @@ abstract class cli_testcase extends \auth_outage\base_testcase {
      *
      * @return string The output text.
      */
-    protected function execute(clibase $cli) {
+    protected function execute(mixed $cli) {
         ob_start();
         try {
             $cli->execute();
diff --git a/tests/local/cli/create_test.php b/tests/local/cli/create_test.php
index 6b94a21..aefeff4 100644
--- a/tests/local/cli/create_test.php
+++ b/tests/local/cli/create_test.php
@@ -23,10 +23,10 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace auth_outage\local\cli;
-
 use auth_outage\dml\outagedb;
 use auth_outage\local\outage;
+use auth_outage\local\cli\create;
+use auth_outage\local\cli\cli_exception;
 
 defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__.'/cli_testcase.php');
diff --git a/tests/local/cli/finish_test.php b/tests/local/cli/finish_test.php
index 48c2443..e872d85 100644
--- a/tests/local/cli/finish_test.php
+++ b/tests/local/cli/finish_test.php
@@ -23,10 +23,10 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace auth_outage\local\cli;
-
 use auth_outage\dml\outagedb;
 use auth_outage\local\outage;
+use auth_outage\local\cli\finish;
+use auth_outage\local\cli\cli_exception;
 
 defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__.'/cli_testcase.php');
diff --git a/tests/local/cli/waitforit_test.php b/tests/local/cli/waitforit_test.php
index 0197bfe..fd9c354 100644
--- a/tests/local/cli/waitforit_test.php
+++ b/tests/local/cli/waitforit_test.php
@@ -23,10 +23,10 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace auth_outage\local\cli;
-
 use auth_outage\dml\outagedb;
 use auth_outage\local\outage;
+use auth_outage\local\cli\waitforit;
+use auth_outage\local\cli\cli_exception;
 
 defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__.'/cli_testcase.php');
diff --git a/tests/local/controllers/infopage_test.php b/tests/local/controllers/infopage_test.php
index 18aeecc..680e682 100644
--- a/tests/local/controllers/infopage_test.php
+++ b/tests/local/controllers/infopage_test.php
@@ -23,9 +23,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace auth_outage\local\controllers;
-
 use auth_outage\local\outage;
+use auth_outage\local\controllers\infopage;
 use context_system;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/tests/local/controllers/maintenance_static_page_test.php b/tests/local/controllers/maintenance_static_page_test.php
index aa554e4..9007022 100644
--- a/tests/local/controllers/maintenance_static_page_test.php
+++ b/tests/local/controllers/maintenance_static_page_test.php
@@ -23,9 +23,10 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace auth_outage\local\controllers;
-
 use auth_outage\task\update_static_page;
+use auth_outage\local\controllers\maintenance_static_page;
+use auth_outage\local\controllers\maintenance_static_page_io;
+use auth_outage\local\controllers\maintenance_static_page_generator;
 use DOMDocument;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/tests/local/outage_test.php b/tests/local/outage_test.php
index ddb6376..afde837 100644
--- a/tests/local/outage_test.php
+++ b/tests/local/outage_test.php
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace auth_outage\local;
+use auth_outage\local\outage;
 
 defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__.'/../base_testcase.php');
diff --git a/tests/local/outagelib_test.php b/tests/local/outagelib_test.php
index 01f1ebb..3d5b3c5 100644
--- a/tests/local/outagelib_test.php
+++ b/tests/local/outagelib_test.php
@@ -14,9 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace auth_outage\local;
-
 use auth_outage\dml\outagedb;
+use auth_outage\local\outage;
+use auth_outage\local\outagelib;
 
 defined('MOODLE_INTERNAL') || die();
 global $CFG;