diff --git a/tests/Unit/Components/Actionlogs/ActionlogConfigModelTest.php b/tests/Unit/Component/Actionlogs/Administrator/Model/ActionlogConfigModelTest.php
similarity index 95%
rename from tests/Unit/Components/Actionlogs/ActionlogConfigModelTest.php
rename to tests/Unit/Component/Actionlogs/Administrator/Model/ActionlogConfigModelTest.php
index 96fecaccad2..ea25fc4e9a2 100644
--- a/tests/Unit/Components/Actionlogs/ActionlogConfigModelTest.php
+++ b/tests/Unit/Component/Actionlogs/Administrator/Model/ActionlogConfigModelTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\Tests\Unit\Components\Actionlogs;
+namespace Joomla\Tests\Unit\Component\Actionlogs\Administrator\Model;
 
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\Component\Actionlogs\Administrator\Model\ActionlogConfigModel;
diff --git a/tests/Unit/CMS/administrator/components/com_finder/src/Indexer/ResultTest.php b/tests/Unit/Component/Finder/Administrator/Indexer/ResultTest.php
similarity index 74%
rename from tests/Unit/CMS/administrator/components/com_finder/src/Indexer/ResultTest.php
rename to tests/Unit/Component/Finder/Administrator/Indexer/ResultTest.php
index fcb17465232..b9e5cf3c542 100644
--- a/tests/Unit/CMS/administrator/components/com_finder/src/Indexer/ResultTest.php
+++ b/tests/Unit/Component/Finder/Administrator/Indexer/ResultTest.php
@@ -6,7 +6,7 @@
  * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
-namespace Joomla\Tests\Unit\Administrator\Components\Finder\Indexer;
+namespace Joomla\Tests\Unit\Component\Finder\Administrator\Indexer;
 
 use Joomla\Component\Finder\Administrator\Indexer\Result;
 use Joomla\Tests\Unit\UnitTestCase;
@@ -19,24 +19,6 @@
  */
 class ResultTest extends UnitTestCase
 {
-	/**
-	 * Include non-autoloaded files as Namespace in the files that don't implement PSR-4
-	 *
-	 * @return void
-	 *
-	 * @since  4.1.3
-	 */
-	protected function setUp(): void
-	{
-		// Can be removed once we have autoloading working in Unit Tests
-		// @see https://github.com/joomla/joomla-cms/pull/36486
-		if (!class_exists(Result::class))
-		{
-			require_once JPATH_ADMINISTRATOR . '/components/com_finder/src/Indexer/Indexer.php';
-			require_once JPATH_ADMINISTRATOR . '/components/com_finder/src/Indexer/Result.php';
-		}
-	}
-
 	/**
 	 * @return void
 	 *