diff --git a/composer.json b/composer.json
index 983bab82972..3380a30123f 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Automattic\\WooCommerce\\Tests\\": "tests/php/"
+      "Automattic\\WooCommerce\\Tests\\": "tests/php/src"
     }
   },
   "scripts": {
diff --git a/tests/php/includes/admin/helper/WCHelperTest.php b/tests/php/includes/admin/helper/class-wc-helper-test.php
similarity index 92%
rename from tests/php/includes/admin/helper/WCHelperTest.php
rename to tests/php/includes/admin/helper/class-wc-helper-test.php
index 2580610b15f..e181f1e365e 100644
--- a/tests/php/includes/admin/helper/WCHelperTest.php
+++ b/tests/php/includes/admin/helper/class-wc-helper-test.php
@@ -5,12 +5,10 @@
  * @package WooCommerce|Tests|WC_Helper.
  */
 
-namespace Automattic\WooCommerce;
-
 /**
  * Class WC_Tests_WC_Helper.
  */
-class WCHelperTest extends \WC_Unit_Test_Case {
+class WC_Helper_Test extends \WC_Unit_Test_Case {
 
 	/**
 	 * Test that woo plugins are loaded correctly even if incorrect cache is intially set.
diff --git a/tests/php/.gitkeep b/tests/php/src/.gitkeep
similarity index 100%
rename from tests/php/.gitkeep
rename to tests/php/src/.gitkeep