diff --git a/exercises/php/composer.json b/exercises/php/composer.json
index 80b34eb5..faa926c0 100644
--- a/exercises/php/composer.json
+++ b/exercises/php/composer.json
@@ -4,7 +4,7 @@
     "autoload": {
         "psr-4": {
             "trivia\\": "trivia/",
-            "Tests\\": "tests/trivia/"
+            "tests\\": "tests/"
         }
     },
     "require": {
diff --git a/exercises/php/tests/trivia/GameRunnerTest.php b/exercises/php/tests/trivia/GameRunnerTest.php
index de9810fe..6cd4348f 100644
--- a/exercises/php/tests/trivia/GameRunnerTest.php
+++ b/exercises/php/tests/trivia/GameRunnerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests;
+namespace tests\trivia;
 
 use PHPUnit\Framework\TestCase;
 use trivia\GameRunner;
diff --git a/exercises/php/tests/trivia/GoldenMaster.php b/exercises/php/tests/trivia/GoldenMaster.php
index 6734adf3..66ceb4ed 100644
--- a/exercises/php/tests/trivia/GoldenMaster.php
+++ b/exercises/php/tests/trivia/GoldenMaster.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests;
+namespace tests\trivia;
 
 use trivia\GameRunner;