diff --git a/phpunit.xml b/phpunit.xml
index a97444c..d5e14ad 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -78,7 +78,8 @@
             <file>tests/Architecture/ListActionContractTest.php</file>
             <file>tests/Architecture/ListDataEndpointContractTest.php</file>
             <file>tests/Architecture/ListTemplateContractTest.php</file>
-            <file>tests/Architecture/ListTitlebarContractTest.php</file>
+            <file>tests/Architecture/ListTitlebarMarkupContractTest.php</file>
+            <file>tests/Architecture/ListTitlebarTemplateContractTest.php</file>
             <file>tests/Architecture/ListUiSharedPartialsContractTest.php</file>
         </testsuite>
         <testsuite name="ArchitectureModules">
diff --git a/tests/Architecture/ListTitlebarContractTest.php b/tests/Architecture/ListTitlebarContractFiles.php
similarity index 53%
rename from tests/Architecture/ListTitlebarContractTest.php
rename to tests/Architecture/ListTitlebarContractFiles.php
index 9dd7974..0e33cc5 100644
--- a/tests/Architecture/ListTitlebarContractTest.php
+++ b/tests/Architecture/ListTitlebarContractFiles.php
@@ -2,16 +2,12 @@
 
 namespace MintyPHP\Tests\Architecture;
 
-use PHPUnit\Framework\TestCase;
-
-class ListTitlebarContractTest extends TestCase
+final class ListTitlebarContractFiles
 {
-    use ProjectFileAssertionSupport;
-
     /**
      * @return list<string>
      */
-    private function titlebarTemplateFiles(): array
+    public static function titlebarTemplateFiles(): array
     {
         return [
             'pages/admin/users/index(default).phtml',
@@ -30,20 +26,4 @@ class ListTitlebarContractTest extends TestCase
             'pages/help/hotkeys(default).phtml',
         ];
     }
-
-    public function testTemplatesUseSharedListTitlebarPartial(): void
-    {
-        foreach ($this->titlebarTemplateFiles() as $file) {
-            $content = $this->readProjectFile($file);
-            $this->assertStringContainsString("require templatePath('partials/app-list-titlebar.phtml');", $content, $file);
-        }
-    }
-
-    public function testTemplatesDoNotInlineLegacyListTitlebarMarkup(): void
-    {
-        foreach ($this->titlebarTemplateFiles() as $file) {
-            $content = $this->readProjectFile($file);
-            $this->assertSame(0, preg_match('/<div\s+class=\"app-list-titlebar\"/', $content), $file);
-        }
-    }
 }
diff --git a/tests/Architecture/ListTitlebarMarkupContractTest.php b/tests/Architecture/ListTitlebarMarkupContractTest.php
new file mode 100644
index 0000000..8bbae2d
--- /dev/null
+++ b/tests/Architecture/ListTitlebarMarkupContractTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace MintyPHP\Tests\Architecture;
+
+use PHPUnit\Framework\TestCase;
+
+final class ListTitlebarMarkupContractTest extends TestCase
+{
+    use ProjectFileAssertionSupport;
+
+    public function testTemplatesDoNotInlineLegacyListTitlebarMarkup(): void
+    {
+        foreach (ListTitlebarContractFiles::titlebarTemplateFiles() as $file) {
+            $content = $this->readProjectFile($file);
+            $this->assertSame(0, preg_match('/<div\s+class=\"app-list-titlebar\"/', $content), $file);
+        }
+    }
+}
diff --git a/tests/Architecture/ListTitlebarTemplateContractTest.php b/tests/Architecture/ListTitlebarTemplateContractTest.php
new file mode 100644
index 0000000..8c58a97
--- /dev/null
+++ b/tests/Architecture/ListTitlebarTemplateContractTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace MintyPHP\Tests\Architecture;
+
+use PHPUnit\Framework\TestCase;
+
+final class ListTitlebarTemplateContractTest extends TestCase
+{
+    use ProjectFileAssertionSupport;
+
+    public function testTemplatesUseSharedListTitlebarPartial(): void
+    {
+        foreach (ListTitlebarContractFiles::titlebarTemplateFiles() as $file) {
+            $content = $this->readProjectFile($file);
+            $this->assertStringContainsString("require templatePath('partials/app-list-titlebar.phtml');", $content, $file);
+        }
+    }
+}
diff --git a/tests/README.md b/tests/README.md
index 94acff5..3b43ac5 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -35,4 +35,4 @@ ohne dass jede Aenderung immer die komplette Suite im Kopf behalten muss.
 - `tests/Architecture/ContainerFactoryContractTest.php`
 - `tests/Architecture/SecurityCryptoContractTest.php`
 - `tests/Architecture/AuthzApiBootstrapContractTest.php`
-- `tests/Architecture/ListTitlebarContractTest.php`
+- `tests/Architecture/ListUiSharedPartialsContractTest.php`