diff --git a/tests/calendar/calendar_test.php b/tests/calendar_test.php
similarity index 100%
rename from tests/calendar/calendar_test.php
rename to tests/calendar_test.php
diff --git a/tests/local/cli/create_test.php b/tests/cli_create_test.php
similarity index 100%
rename from tests/local/cli/create_test.php
rename to tests/cli_create_test.php
diff --git a/tests/local/cli/finish_test.php b/tests/cli_finish_test.php
similarity index 100%
rename from tests/local/cli/finish_test.php
rename to tests/cli_finish_test.php
diff --git a/tests/local/cli/cli_test.php b/tests/cli_test.php
similarity index 100%
rename from tests/local/cli/cli_test.php
rename to tests/cli_test.php
diff --git a/tests/local/cli/cli_testcase.php b/tests/cli_testcase.php
similarity index 96%
rename from tests/local/cli/cli_testcase.php
rename to tests/cli_testcase.php
index e9cec6f..c449293 100644
--- a/tests/local/cli/cli_testcase.php
+++ b/tests/cli_testcase.php
@@ -24,7 +24,7 @@
  */
 
 defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__.'/../../base_testcase.php');
+require_once(__DIR__.'/base_testcase.php');
 
 /**
  * cli_testcase class.
@@ -34,7 +34,7 @@ require_once(__DIR__.'/../../base_testcase.php');
  * @copyright  2016 Catalyst IT
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-abstract class cli_testcase extends \auth_outage\base_testcase {
+abstract class cli_testcase extends base_testcase {
 
     public function tearDown(): void {
         parent::tearDown();
diff --git a/tests/local/cli/waitforit_test.php b/tests/cli_waitforit_test.php
similarity index 100%
rename from tests/local/cli/waitforit_test.php
rename to tests/cli_waitforit_test.php
diff --git a/tests/local/controllers/infopage_test.php b/tests/controllers_infopage_test.php
similarity index 98%
rename from tests/local/controllers/infopage_test.php
rename to tests/controllers_infopage_test.php
index 680e682..d78e6ce 100644
--- a/tests/local/controllers/infopage_test.php
+++ b/tests/controllers_infopage_test.php
@@ -28,7 +28,7 @@ use auth_outage\local\controllers\infopage;
 use context_system;
 
 defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__.'/../../base_testcase.php');
+require_once(__DIR__.'/base_testcase.php');
 
 /**
  * Tests performed on infopage controller class and update_static_page task class.
@@ -39,7 +39,7 @@ require_once(__DIR__.'/../../base_testcase.php');
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \auth_outage\local\controllers\infopage
  */
-class infopage_test extends \auth_outage\base_testcase {
+class controllers_infopage_test extends base_testcase {
 
     public function tearDown(): void {
         parent::tearDown();
diff --git a/tests/local/controllers/maintenance_static_page_test.php b/tests/controllers_maintenance_static_page_test.php
similarity index 98%
rename from tests/local/controllers/maintenance_static_page_test.php
rename to tests/controllers_maintenance_static_page_test.php
index 9007022..3c142f8 100644
--- a/tests/local/controllers/maintenance_static_page_test.php
+++ b/tests/controllers_maintenance_static_page_test.php
@@ -30,7 +30,7 @@ use auth_outage\local\controllers\maintenance_static_page_generator;
 use DOMDocument;
 
 defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__.'/../../base_testcase.php');
+require_once(__DIR__.'/base_testcase.php');
 
 /**
  * maintenance_static_page_test class.
@@ -41,7 +41,7 @@ require_once(__DIR__.'/../../base_testcase.php');
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \auth_outage\local\controllers\maintenance_static_page_generator
  */
-class maintenance_static_page_test extends \auth_outage\base_testcase {
+class controllers_maintenance_static_page_test extends base_testcase {
 
     public function tearDown(): void {
         parent::tearDown();
@@ -128,7 +128,7 @@ class maintenance_static_page_test extends \auth_outage\base_testcase {
         $page->generate();
 
         // Check for css file.
-        self::assertFileExists($page->get_io()->get_resources_folder().'/53365950336b070c0b26ca50e7d0dad962c364e6.dGV4dC9wbGFpbg');
+        self::assertFileExists($page->get_io()->get_resources_folder().'/b09bd4b66cc3964d5fc5978752fc554f5666daa3.dGV4dC9wbGFpbg');
 
         // Check for catalyst.png file referenced in url(..) of css.
         self::assertFileExists($page->get_io()->get_resources_folder().'/ff7f7f87a26a908fc72930eaefb6b57306361d16.aW1hZ2UvcG5n');
@@ -146,7 +146,7 @@ class maintenance_static_page_test extends \auth_outage\base_testcase {
         $page->generate();
 
         // Check for css file.
-        self::assertFileExists($page->get_io()->get_resources_folder().'/e0b34925c1f939c247a4b50d6bf08c76088def39.dGV4dC9wbGFpbg');
+        self::assertFileExists($page->get_io()->get_resources_folder().'/2ec04228cc8bb37782f511aaeb01ee553cc884a4.dGV4dC9wbGFpbg');
 
         // Check for catalyst.png file referenced in url(..) of css.
         self::assertFileExists($page->get_io()->get_resources_folder().'/ff7f7f87a26a908fc72930eaefb6b57306361d16.aW1hZ2UvcG5n');
@@ -344,7 +344,7 @@ class maintenance_static_page_test extends \auth_outage\base_testcase {
      * @return string
      */
     private function get_fixture_path_location($file) {
-        return (string)new \moodle_url('/auth/outage/tests/local/controllers/fixtures/'.$file);
+        return (string)new \moodle_url('/auth/outage/tests/fixtures/'.$file);
     }
 
     /**
diff --git a/tests/dml/events_test.php b/tests/dml_events_test.php
similarity index 100%
rename from tests/dml/events_test.php
rename to tests/dml_events_test.php
diff --git a/tests/dml/installation_test.php b/tests/dml_installation_test.php
similarity index 97%
rename from tests/dml/installation_test.php
rename to tests/dml_installation_test.php
index fecad0f..2f0b02e 100644
--- a/tests/dml/installation_test.php
+++ b/tests/dml_installation_test.php
@@ -29,7 +29,7 @@ use auth_outage\local\outage;
 use auth_outage\dml\outagedb;
 
 defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__.'/../base_testcase.php');
+require_once(__DIR__.'/base_testcase.php');
 
 /**
  * installation_test test class.
@@ -42,7 +42,7 @@ require_once(__DIR__.'/../base_testcase.php');
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \auth_outage\dml\outagedb
  */
-class installation_test extends \auth_outage\base_testcase {
+class dml_installation_test extends base_testcase {
 
     public function tearDown(): void {
         parent::tearDown();
diff --git a/tests/dml/outagedb_test.php b/tests/dml_outagedb_test.php
similarity index 99%
rename from tests/dml/outagedb_test.php
rename to tests/dml_outagedb_test.php
index df60cbc..55dea89 100644
--- a/tests/dml/outagedb_test.php
+++ b/tests/dml_outagedb_test.php
@@ -27,7 +27,7 @@ use auth_outage\local\outage;
 use auth_outage\dml\outagedb;
 
 defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__.'/../base_testcase.php');
+require_once(__DIR__.'/base_testcase.php');
 
 /**
  * outagedb_test tests class.
@@ -38,7 +38,7 @@ require_once(__DIR__.'/../base_testcase.php');
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \auth_outage\dml\outagedb
  */
-class outagedb_test extends \auth_outage\base_testcase {
+class dml_outagedb_test extends base_testcase {
 
     public function tearDown(): void {
         parent::tearDown();
diff --git a/tests/local/controllers/fixtures/catalyst.png b/tests/fixtures/catalyst.png
similarity index 100%
rename from tests/local/controllers/fixtures/catalyst.png
rename to tests/fixtures/catalyst.png
diff --git a/tests/local/controllers/fixtures/simple.css b/tests/fixtures/simple.css
similarity index 100%
rename from tests/local/controllers/fixtures/simple.css
rename to tests/fixtures/simple.css
diff --git a/tests/local/controllers/fixtures/subdir/withurls-subdir.css b/tests/fixtures/subdir/withurls-subdir.css
similarity index 100%
rename from tests/local/controllers/fixtures/subdir/withurls-subdir.css
rename to tests/fixtures/subdir/withurls-subdir.css
diff --git a/tests/local/controllers/fixtures/withurls-quoted.css b/tests/fixtures/withurls-quoted.css
similarity index 100%
rename from tests/local/controllers/fixtures/withurls-quoted.css
rename to tests/fixtures/withurls-quoted.css
diff --git a/tests/local/controllers/fixtures/withurls.css b/tests/fixtures/withurls.css
similarity index 100%
rename from tests/local/controllers/fixtures/withurls.css
rename to tests/fixtures/withurls.css
diff --git a/tests/form/outage/forms_test.php b/tests/forms_test.php
similarity index 98%
rename from tests/form/outage/forms_test.php
rename to tests/forms_test.php
index f7ed590..de5c569 100644
--- a/tests/form/outage/forms_test.php
+++ b/tests/forms_test.php
@@ -29,7 +29,7 @@ use auth_outage\form\outage\finish;
 use auth_outage\form\outage\edit;
 
 defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__.'/../../base_testcase.php');
+require_once(__DIR__.'/base_testcase.php');
 
 /**
  * forms_test test class.
@@ -40,7 +40,7 @@ require_once(__DIR__.'/../../base_testcase.php');
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers      \auth_outage\form\outage\edit
  */
-class forms_test extends \auth_outage\base_testcase {
+class forms_test extends base_testcase {
 
     public function tearDown(): void {
         parent::tearDown();
diff --git a/tests/local/outage_test.php b/tests/outage_test.php
similarity index 99%
rename from tests/local/outage_test.php
rename to tests/outage_test.php
index afde837..9c06b6d 100644
--- a/tests/local/outage_test.php
+++ b/tests/outage_test.php
@@ -17,7 +17,7 @@
 use auth_outage\local\outage;
 
 defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__.'/../base_testcase.php');
+require_once(__DIR__.'/base_testcase.php');
 
 /**
  * outage_test test class.
@@ -28,7 +28,7 @@ require_once(__DIR__.'/../base_testcase.php');
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \auth_outage\local\outage
  */
-class outage_test extends \auth_outage\base_testcase {
+class outage_test extends base_testcase {
 
     public function tearDown(): void {
         parent::tearDown();
diff --git a/tests/local/outagelib_test.php b/tests/outagelib_test.php
similarity index 99%
rename from tests/local/outagelib_test.php
rename to tests/outagelib_test.php
index 3d5b3c5..e41efa0 100644
--- a/tests/local/outagelib_test.php
+++ b/tests/outagelib_test.php
@@ -21,7 +21,7 @@ use auth_outage\local\outagelib;
 defined('MOODLE_INTERNAL') || die();
 global $CFG;
 require_once($CFG->libdir.'/adminlib.php');
-require_once(__DIR__.'/../base_testcase.php');
+require_once(__DIR__.'/base_testcase.php');
 
 /**
  * outagelib_test test class.
@@ -32,7 +32,7 @@ require_once(__DIR__.'/../base_testcase.php');
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \auth_outage\local\outagelib
  */
-class outagelib_test extends \auth_outage\base_testcase {
+class outagelib_test extends base_testcase {
 
     public function tearDown(): void {
         parent::tearDown();