diff --git a/.gitattributes b/.gitattributes
index b5d3da03cbb..9dabeff5ad2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
 /.* export-ignore
 /phpcs.xml export-ignore
 /phpunit.* export-ignore
-/unit-tests export-ignore
+/tests export-ignore
 /vendor export-ignore
 /README.md export-ignore
 /readme.txt export-ignore
diff --git a/.gitignore b/.gitignore
index dd37e6a9ec2..992c5e6328a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,7 @@ Thumbs.db
 
 # Unit tests
 /tmp
-/unit-tests/bin/tmp
+/tests/bin/tmp
 
 # Logs
 /logs
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 425a5847ebc..04bbd2b73b4 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -27,7 +27,7 @@ filter:
     - src/Controllers/Version1/
     - src/Controllers/Version2/
     - src/Controllers/Version3/
-    - unit-tests/
+    - tests/
     - vendor/
     - classmap.php
 coding_style:
diff --git a/.travis.yml b/.travis.yml
index ecc05440f0b..38f92b14e2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,8 @@ before_script:
   - composer install
   - composer global require "phpunit/phpunit=4.8.*|6.5.*"
   - composer require woocommerce/woocommerce-sniffs
-  - bash unit-tests/bin/install.sh woocommerce_test root '' localhost $WP_VERSION
+  - bash tests/bin/install.sh woocommerce_test root '' localhost $WP_VERSION
 
 script:
-  - bash unit-tests/bin/phpunit.sh
-  - bash unit-tests/bin/phpcs.sh
\ No newline at end of file
+  - bash tests/bin/phpunit.sh
+  - bash tests/bin/phpcs.sh
diff --git a/phpunit.xml b/phpunit.xml
index 8f9df0b9fb5..ddb43245333 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-	bootstrap="unit-tests/Bootstrap.php"
+	bootstrap="tests/Bootstrap.php"
 	backupGlobals="false"
 	colors="true"
 	convertErrorsToExceptions="true"
@@ -11,10 +11,10 @@
 	>
 	<testsuites>
 		<testsuite name="WooCommerce REST API Test Suite">
-			<directory suffix=".php">./unit-tests/Tests</directory>
+			<directory suffix=".php">./tests/Tests</directory>
 		</testsuite>
 		<testsuite name="v4">
-			<directory suffix=".php">./unit-tests/Tests/Version4</directory>
+			<directory suffix=".php">./tests/Tests/Version4</directory>
 		</testsuite>
 	</testsuites>
 </phpunit>
diff --git a/unit-tests/Bootstrap.php b/unit-tests/Bootstrap.php
index 4988801e59d..d4658968ce8 100755
--- a/unit-tests/Bootstrap.php
+++ b/unit-tests/Bootstrap.php
@@ -21,14 +21,14 @@ class Bootstrap {
 	protected $wp_tests_dir;
 
 	/**
-	 * unit-tests directory.
+	 * Tests directory.
 	 *
 	 * @var string
 	 */
 	protected $tests_dir;
 
 	/**
-	 * WC Core unit-tests directory.
+	 * WC Core unit tests directory.
 	 *
 	 * @var string
 	 */