diff --git a/.gitattributes b/.gitattributes
index 9dabeff5ad2..b5d3da03cbb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
 /.* export-ignore
 /phpcs.xml export-ignore
 /phpunit.* export-ignore
-/tests export-ignore
+/unit-tests export-ignore
 /vendor export-ignore
 /README.md export-ignore
 /readme.txt export-ignore
diff --git a/.gitignore b/.gitignore
index 992c5e6328a..77f4d76fe9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,3 @@ Thumbs.db
 
 # composer
 vendor/
-classmap.php.bak
diff --git a/phpunit.xml b/phpunit.xml
index ddb43245333..8f9df0b9fb5 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-	bootstrap="tests/Bootstrap.php"
+	bootstrap="unit-tests/Bootstrap.php"
 	backupGlobals="false"
 	colors="true"
 	convertErrorsToExceptions="true"
@@ -11,10 +11,10 @@
 	>
 	<testsuites>
 		<testsuite name="WooCommerce REST API Test Suite">
-			<directory suffix=".php">./tests/Tests</directory>
+			<directory suffix=".php">./unit-tests/Tests</directory>
 		</testsuite>
 		<testsuite name="v4">
-			<directory suffix=".php">./tests/Tests/Version4</directory>
+			<directory suffix=".php">./unit-tests/Tests/Version4</directory>
 		</testsuite>
 	</testsuites>
 </phpunit>