diff --git a/tests/Unit/Models/ReportTemplateTest.php b/tests/Unit/Models/ReportTemplates/ReportTemplateParsingValuesTest.php
similarity index 89%
rename from tests/Unit/Models/ReportTemplateTest.php
rename to tests/Unit/Models/ReportTemplates/ReportTemplateParsingValuesTest.php
index 240b8d3892..2973b3b808 100644
--- a/tests/Unit/Models/ReportTemplateTest.php
+++ b/tests/Unit/Models/ReportTemplates/ReportTemplateParsingValuesTest.php
@@ -1,36 +1,16 @@
 <?php
 
-namespace Tests\Unit\Models;
+namespace Tests\Unit\Models\ReportTemplates;
 
 use App\Models\Department;
 use App\Models\Location;
 use App\Models\ReportTemplate;
-use App\Models\User;
-use Illuminate\Database\Eloquent\Collection;
 use PHPUnit\Framework\Attributes\Group;
 use Tests\TestCase;
 
 #[Group('custom-reporting')]
-class ReportTemplateTest extends TestCase
+class ReportTemplateParsingValuesTest extends TestCase
 {
-    public function testSavedTemplatesAreScopedToTheUser()
-    {
-        // Given there is a saved template for one user
-        ReportTemplate::factory()->create(['name' => 'Report A']);
-
-        // When loading reports/custom while acting as another user that also has a saved template
-        $user = User::factory()->canViewReports()
-            ->has(ReportTemplate::factory(['name' => 'Report B']))
-            ->create();
-
-        // The user should not see the other user's template (in view as 'report_templates')
-        $this->actingAs($user)
-            ->get(route('reports/custom'))
-            ->assertViewHas(['report_templates' => function (Collection $reports) {
-                return $reports->pluck('name')->doesntContain('Report A');
-            }]);
-    }
-
     public function testParsingValuesOnNonExistentReportTemplate()
     {
         $unsavedTemplate = new ReportTemplate;
diff --git a/tests/Unit/Models/ReportTemplates/ReportTemplateScopingTest.php b/tests/Unit/Models/ReportTemplates/ReportTemplateScopingTest.php
new file mode 100644
index 0000000000..67052f7d4f
--- /dev/null
+++ b/tests/Unit/Models/ReportTemplates/ReportTemplateScopingTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Unit\Models\ReportTemplates;
+
+use App\Models\ReportTemplate;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Collection;
+use PHPUnit\Framework\Attributes\Group;
+use Tests\TestCase;
+
+#[Group('custom-reporting')]
+class ReportTemplateScopingTest extends TestCase
+{
+    public function testSavedTemplatesAreScopedToTheUser()
+    {
+        // Given there is a saved template for one user
+        ReportTemplate::factory()->create(['name' => 'Report A']);
+
+        // When loading reports/custom while acting as another user that also has a saved template
+        $user = User::factory()->canViewReports()
+            ->has(ReportTemplate::factory(['name' => 'Report B']))
+            ->create();
+
+        // The user should not see the other user's template (in view as 'report_templates')
+        $this->actingAs($user)
+            ->get(route('reports/custom'))
+            ->assertViewHas(['report_templates' => function (Collection $reports) {
+                return $reports->pluck('name')->doesntContain('Report A');
+            }]);
+    }
+}