diff --git a/ahoy.test.yml b/ahoy.test.yml
index 63ce6d50a53f5e5cd88b4150f57f55793dbb8b63..35bb0b39bc2886de4bc4a4783cffefd51fe53957 100644
--- a/ahoy.test.yml
+++ b/ahoy.test.yml
@@ -1,14 +1,14 @@
 ahoyapi: v2
 commands:
   phpcs:
-    cmd: ahoy d4d exec vendor/bin/phpcs --standard=DrupalPractice /var/www/html/web/modules/custom/ /var/www/html/web/profiles/custom/ /var/www/html/web/themes/custom/
+    cmd: ahoy d4d exec vendor/bin/phpcs --standard=DrupalPractice --file-list=/var/www/html/tests/phpcs.files "$@"
     usage: PHP coding standards
   phpunit:
-    cmd: ahoy d4d exec vendor/bin/phpunit --configuration /var/www/html/tests/phpunit.xml.dist
+    cmd: ahoy d4d exec vendor/bin/phpunit --configuration /var/www/html/tests/phpunit.xml.dist "$@"
     usage: PHP unit tests
   phpunit:list:suites:
-    cmd: ahoy d4d exec vendor/bin/phpunit --configuration /var/www/html/tests/phpunit.xml.dist --list-suites
+    cmd: ahoy d4d exec vendor/bin/phpunit --configuration /var/www/html/tests/phpunit.xml.dist --list-suites "$@"
     usage: List available test suites of PHP unit tests
   phpunit:list:groups:
-    cmd: ahoy d4d exec vendor/bin/phpunit --configuration /var/www/html/tests/phpunit.xml.dist --list-groups
+    cmd: ahoy d4d exec vendor/bin/phpunit --configuration /var/www/html/tests/phpunit.xml.dist --list-groups "$@"
     usage: List available test groups of PHP unit tests
diff --git a/src/Handler.php b/src/Handler.php
index 86a0f46d0e86aaeba4b4ee8cc82b9be3de324c74..dfe17058a87b4b369db83fa9c91668f80d2f3978 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -129,7 +129,7 @@ class Handler extends BaseHandler {
     }
 
     // Copy Test files.
-    foreach (['phpunit.xml.dist'] as $template) {
+    foreach (['phpcs.files', 'phpunit.xml.dist'] as $template) {
       $fs->copy($pluginRoot . '/templates/tests/' . $template, 'tests/' . $template);
     }
 
diff --git a/templates/tests/phpcs.files b/templates/tests/phpcs.files
new file mode 100644
index 0000000000000000000000000000000000000000..1efc94e10645ddfd4dd699cc6f83f644fa683851
--- /dev/null
+++ b/templates/tests/phpcs.files
@@ -0,0 +1,3 @@
+/var/www/html/web/modules/custom/
+/var/www/html/web/profiles/custom/
+/var/www/html/web/themes/custom/