diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/composer.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/composer.mustache
index 65a4eceed6c3..ad746666cb20 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/composer.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/composer.mustache
@@ -46,8 +46,6 @@
     ],
     "test-apis": "phpunit --testsuite Apis",
     "test-models": "phpunit --testsuite Models",
-    "test-mock": "phpunit --testsuite Mock",
-    "test-utils": "phpunit --testsuite Utils",
     "phpcs": "phpcs",
     "phplint": "phplint ./ --exclude=vendor"
   }
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/phpunit.xml.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/phpunit.xml.mustache
index 82f864390833..b8852944a12d 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/phpunit.xml.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/phpunit.xml.mustache
@@ -17,19 +17,11 @@
         <testsuite name="Models">
             <directory>{{modelTestPath}}</directory>
         </testsuite>
-        <testsuite name="Mock">
-            <directory>{{mockTestPath}}</directory>
-        </testsuite>
-        <testsuite name="Utils">
-            <directory>{{utilsTestPath}}</directory>
-        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">{{apiSrcPath}}</directory>
             <directory suffix=".php">{{modelSrcPath}}</directory>
-            <directory suffix=".php">{{mockSrcPath}}</directory>
-            <directory suffix=".php">{{utilsSrcPath}}</directory>
         </whitelist>
     </filter>
     <php>
diff --git a/samples/server/petstore/php-slim4/.openapi-generator/FILES b/samples/server/petstore/php-slim4/.openapi-generator/FILES
index 08d44362bcff..ba22c031220d 100644
--- a/samples/server/petstore/php-slim4/.openapi-generator/FILES
+++ b/samples/server/petstore/php-slim4/.openapi-generator/FILES
@@ -81,61 +81,7 @@ lib/Utils/ModelUtilsTrait.php
 lib/Utils/StringUtilsTrait.php
 phpcs.xml.dist
 phpunit.xml.dist
-test/Api/AnotherFakeApiTest.php
-test/Api/FakeApiTest.php
-test/Api/FakeClassnameTags123ApiTest.php
-test/Api/PetApiTest.php
-test/Api/StoreApiTest.php
-test/Api/UserApiTest.php
 test/Mock/OpenApiDataMockerMiddlewareTest.php
 test/Mock/OpenApiDataMockerTest.php
-test/Model/AdditionalPropertiesAnyTypeTest.php
-test/Model/AdditionalPropertiesArrayTest.php
-test/Model/AdditionalPropertiesBooleanTest.php
-test/Model/AdditionalPropertiesClassTest.php
-test/Model/AdditionalPropertiesIntegerTest.php
-test/Model/AdditionalPropertiesNumberTest.php
-test/Model/AdditionalPropertiesObjectTest.php
-test/Model/AdditionalPropertiesStringTest.php
-test/Model/AnimalTest.php
-test/Model/ApiResponseTest.php
-test/Model/ArrayOfArrayOfNumberOnlyTest.php
-test/Model/ArrayOfNumberOnlyTest.php
-test/Model/ArrayTestTest.php
-test/Model/BigCatAllOfTest.php
-test/Model/BigCatTest.php
-test/Model/CapitalizationTest.php
-test/Model/CatAllOfTest.php
-test/Model/CatTest.php
-test/Model/CategoryTest.php
-test/Model/ClassModelTest.php
-test/Model/ClientTest.php
-test/Model/DogAllOfTest.php
-test/Model/DogTest.php
-test/Model/EnumArraysTest.php
-test/Model/EnumClassTest.php
-test/Model/EnumTestTest.php
-test/Model/FileSchemaTestClassTest.php
-test/Model/FileTest.php
-test/Model/FormatTestTest.php
-test/Model/HasOnlyReadOnlyTest.php
-test/Model/MapTestTest.php
-test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
-test/Model/Model200ResponseTest.php
-test/Model/ModelListTest.php
-test/Model/ModelReturnTest.php
-test/Model/NameTest.php
-test/Model/NumberOnlyTest.php
-test/Model/OrderTest.php
-test/Model/OuterCompositeTest.php
-test/Model/OuterEnumTest.php
-test/Model/PetTest.php
-test/Model/ReadOnlyFirstTest.php
-test/Model/SpecialModelNameTest.php
-test/Model/TagTest.php
-test/Model/TypeHolderDefaultTest.php
-test/Model/TypeHolderExampleTest.php
-test/Model/UserTest.php
-test/Model/XmlItemTest.php
 test/Utils/ModelUtilsTraitTest.php
 test/Utils/StringUtilsTraitTest.php
diff --git a/samples/server/petstore/php-slim4/composer.json b/samples/server/petstore/php-slim4/composer.json
index 6046fa4a47f5..0bc4d34e177f 100644
--- a/samples/server/petstore/php-slim4/composer.json
+++ b/samples/server/petstore/php-slim4/composer.json
@@ -33,8 +33,6 @@
     ],
     "test-apis": "phpunit --testsuite Apis",
     "test-models": "phpunit --testsuite Models",
-    "test-mock": "phpunit --testsuite Mock",
-    "test-utils": "phpunit --testsuite Utils",
     "phpcs": "phpcs",
     "phplint": "phplint ./ --exclude=vendor"
   }
diff --git a/samples/server/petstore/php-slim4/phpunit.xml.dist b/samples/server/petstore/php-slim4/phpunit.xml.dist
index d09042687960..6af1442ee653 100644
--- a/samples/server/petstore/php-slim4/phpunit.xml.dist
+++ b/samples/server/petstore/php-slim4/phpunit.xml.dist
@@ -17,19 +17,11 @@
         <testsuite name="Models">
             <directory>./test/Model</directory>
         </testsuite>
-        <testsuite name="Mock">
-            <directory>./test/Mock</directory>
-        </testsuite>
-        <testsuite name="Utils">
-            <directory>./test/Utils</directory>
-        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./lib/Api</directory>
             <directory suffix=".php">./lib/Model</directory>
-            <directory suffix=".php">./lib/Mock</directory>
-            <directory suffix=".php">./lib/Utils</directory>
         </whitelist>
     </filter>
     <php>