diff --git a/assets/root-files/gitignore b/assets/root-files/gitignore
index 90bc698..316dde6 100644
--- a/assets/root-files/gitignore
+++ b/assets/root-files/gitignore
@@ -8,3 +8,7 @@
 build/
 nbproject
 tmp/
+
+phpunit.xml
+test/TestConfiguration.php
+vendor
diff --git a/assets/root-files/phpunit.xml.dist b/assets/root-files/phpunit.xml.dist
index d60beed..1e17925 100644
--- a/assets/root-files/phpunit.xml.dist
+++ b/assets/root-files/phpunit.xml.dist
@@ -1,7 +1,7 @@
-<phpunit bootstrap="./test/Bootstrap.php" colors="true">
+<phpunit bootstrap="./Bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="zend-{COMPONENT} Test Suite">
-            <directory>./test/{COMPONENT_NAME}</directory>
+            <directory>./test</directory>
         </testsuite>
     </testsuites>
 
diff --git a/assets/test-files/gitignore b/assets/test-files/gitignore
deleted file mode 100644
index 902db60..0000000
--- a/assets/test-files/gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-phpunit.xml
-TestConfiguration.php
diff --git a/bin/composer-rewriter.php b/bin/composer-rewriter.php
index 570d571..c505bc5 100644
--- a/bin/composer-rewriter.php
+++ b/bin/composer-rewriter.php
@@ -37,7 +37,7 @@
 // Setup development autoloading rules
 $composer['autoload-dev'] = [
     'psr-4' => [
-        'ZendTest\\' . $component . '\\' => 'test/' . $component . '/',
+        'ZendTest\\' . $component . '\\' => 'test/',
     ],
 ];
 
diff --git a/bin/tree-filter.php b/bin/tree-filter.php
index 37c7556..76fae20 100644
--- a/bin/tree-filter.php
+++ b/bin/tree-filter.php
@@ -115,11 +115,10 @@
 }
 
 // Test directory files
-copy($assetDir . '/test-files/gitignore', 'test/.gitignore');
 file_put_contents(
     'test/Bootstrap.php',
     str_replace('{COMPONENT}', $normalized, file_get_contents($assetDir . '/test-files/Bootstrap.php'))
 );
-copy($testConfigDist, 'test/TestConfiguration.php.dist');
-copy($testConfigTravis, 'test/TestConfiguration.php.travis');
+copy($testConfigDist, 'TestConfiguration.php.dist');
+copy($testConfigTravis, 'TestConfiguration.php.travis');
 exit(0);