diff --git a/Configuration/Extbase/Persistence/Classes.php b/Configuration/Extbase/Persistence/Classes.php
index 75b5662..925d5fb 100644
--- a/Configuration/Extbase/Persistence/Classes.php
+++ b/Configuration/Extbase/Persistence/Classes.php
@@ -67,11 +67,4 @@
             ],
         ],
     ],
-    // Test fixture classes — map to pages table (only loaded in test context)
-    \Zeroseven\Pagebased\Tests\Functional\Fixtures\Classes\TestObject::class => [
-        'tableName' => \Zeroseven\Pagebased\Domain\Model\AbstractPage::TABLE_NAME,
-    ],
-    \Zeroseven\Pagebased\Tests\Functional\Fixtures\Classes\TestCategory::class => [
-        'tableName' => \Zeroseven\Pagebased\Domain\Model\AbstractPage::TABLE_NAME,
-    ],
 ];
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
index 9a03bb0..3430f75 100644
--- a/Configuration/Services.yaml
+++ b/Configuration/Services.yaml
@@ -7,10 +7,6 @@ services:
     Zeroseven\Pagebased\:
         resource: '../Classes/*'
 
-    Zeroseven\Pagebased\Tests\Functional\Fixtures\Classes\:
-        resource: '../Tests/Functional/Fixtures/Classes/*'
-        public: true
-
     Zeroseven\Pagebased\Middleware\RssFeed:
         arguments:
             $cache: '@cache.pagebased_rss_feed'
diff --git a/Tests/Functional/Domain/Repository/AbstractObjectRepositoryTest.php b/Tests/Functional/Domain/Repository/AbstractObjectRepositoryTest.php
index 08a0ce8..a047ef1 100644
--- a/Tests/Functional/Domain/Repository/AbstractObjectRepositoryTest.php
+++ b/Tests/Functional/Domain/Repository/AbstractObjectRepositoryTest.php
@@ -39,6 +39,7 @@ class AbstractObjectRepositoryTest extends FunctionalTestCase
 {
     protected array $testExtensionsToLoad = [
         'typo3conf/ext/pagebased',
+        'typo3conf/ext/pagebased/Tests/Functional/Fixtures',
     ];
 
     protected array $coreExtensionsToLoad = [
diff --git a/Tests/Functional/Fixtures/Configuration/Extbase/Persistence/Classes.php b/Tests/Functional/Fixtures/Configuration/Extbase/Persistence/Classes.php
new file mode 100644
index 0000000..4400927
--- /dev/null
+++ b/Tests/Functional/Fixtures/Configuration/Extbase/Persistence/Classes.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    \Zeroseven\Pagebased\Tests\Functional\Fixtures\Classes\TestObject::class => [
+        'tableName' => \Zeroseven\Pagebased\Domain\Model\AbstractPage::TABLE_NAME,
+    ],
+    \Zeroseven\Pagebased\Tests\Functional\Fixtures\Classes\TestCategory::class => [
+        'tableName' => \Zeroseven\Pagebased\Domain\Model\AbstractPage::TABLE_NAME,
+    ],
+];
diff --git a/Tests/Functional/Fixtures/Configuration/Services.yaml b/Tests/Functional/Fixtures/Configuration/Services.yaml
new file mode 100644
index 0000000..b87cc8e
--- /dev/null
+++ b/Tests/Functional/Fixtures/Configuration/Services.yaml
@@ -0,0 +1,8 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: true
+
+    Zeroseven\Pagebased\Tests\Functional\Fixtures\Classes\:
+        resource: '../Classes/*'
diff --git a/Tests/Functional/Fixtures/ext_emconf.php b/Tests/Functional/Fixtures/ext_emconf.php
new file mode 100644
index 0000000..0dde0bb
--- /dev/null
+++ b/Tests/Functional/Fixtures/ext_emconf.php
@@ -0,0 +1,16 @@
+<?php
+
+$EM_CONF[$_EXTKEY] = [
+    'title' => 'Pagebased Test Fixtures',
+    'description' => 'Test fixtures for pagebased functional tests',
+    'category' => 'misc',
+    'version' => '1.0.0',
+    'state' => 'stable',
+    'author' => 'zeroseven',
+    'author_email' => 'typo3@zeroseven.de',
+    'constraints' => [
+        'depends' => [
+            'typo3' => '12.4.0-12.99.99',
+        ],
+    ],
+];
diff --git a/Tests/Functional/Performance/RepositoryPerformanceTest.php b/Tests/Functional/Performance/RepositoryPerformanceTest.php
index 01eef26..999eac0 100644
--- a/Tests/Functional/Performance/RepositoryPerformanceTest.php
+++ b/Tests/Functional/Performance/RepositoryPerformanceTest.php
@@ -29,7 +29,10 @@
  */
 final class RepositoryPerformanceTest extends FunctionalTestCase
 {
-    protected array $testExtensionsToLoad = ['typo3conf/ext/pagebased'];
+    protected array $testExtensionsToLoad = [
+        'typo3conf/ext/pagebased',
+        'typo3conf/ext/pagebased/Tests/Functional/Fixtures',
+    ];
 
     protected array $configurationToUseInTestInstance = [
         'DB' => [