diff --git a/tests/Unit/AbstractWPUnitTestWithSafeFiltering.php b/tests/Unit/AbstractWPUnitTestWithSafeFiltering.php
index fc199a942..fe9f11b89 100644
--- a/tests/Unit/AbstractWPUnitTestWithSafeFiltering.php
+++ b/tests/Unit/AbstractWPUnitTestWithSafeFiltering.php
@@ -3,7 +3,7 @@
  * Abstract test case for unit tests.
  */
 
-namespace WooCommerce\Facebook\Tests\Unit;
+namespace WooCommerce\Facebook\Tests;
 
 use WP_UnitTestCase;
 
diff --git a/tests/Unit/Admin/Settings/ConnectionTest.php b/tests/Unit/Admin/Settings/ConnectionTest.php
index 6fea9433b..b292246ea 100644
--- a/tests/Unit/Admin/Settings/ConnectionTest.php
+++ b/tests/Unit/Admin/Settings/ConnectionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WooCommerce\Facebook\Tests\Unit;
+namespace WooCommerce\Facebook\Tests\Admin\Settings;
 
 use WooCommerce\Facebook\Admin\Settings_Screens\Connection;
 
diff --git a/tests/Unit/Admin/Settings/ShopsTest.php b/tests/Unit/Admin/Settings/ShopsTest.php
index cf450ecfd..a8e8b3bfa 100644
--- a/tests/Unit/Admin/Settings/ShopsTest.php
+++ b/tests/Unit/Admin/Settings/ShopsTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace WooCommerce\Facebook\Tests\Unit\Admin\Settings;
+namespace WooCommerce\Facebook\Tests\Admin\Settings;
 
 use WooCommerce\Facebook\Admin\Settings_Screens\Shops;
 
diff --git a/tests/Unit/Admin/Settings_Screens/ConnectionTest.php b/tests/Unit/Admin/Settings_Screens/ConnectionTest.php
index 898d4dde0..52b224964 100644
--- a/tests/Unit/Admin/Settings_Screens/ConnectionTest.php
+++ b/tests/Unit/Admin/Settings_Screens/ConnectionTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace WooCommerce\Facebook\Tests\Unit\Admin\Settings_Screens;
+namespace WooCommerce\Facebook\Tests\Admin\Settings_Screens;
 
 use PHPUnit\Framework\TestCase;
 use WooCommerce\Facebook\Admin\Settings_Screens\Connection;
diff --git a/tests/Unit/Admin/Settings_Screens/ShopsTest.php b/tests/Unit/Admin/Settings_Screens/ShopsTest.php
index 05f1a8ed3..e88e19ea5 100644
--- a/tests/Unit/Admin/Settings_Screens/ShopsTest.php
+++ b/tests/Unit/Admin/Settings_Screens/ShopsTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace WooCommerce\Facebook\Tests\Unit\Admin\Settings_Screens;
+namespace WooCommerce\Facebook\Tests\Admin\Settings_Screens;
 
 use PHPUnit\Framework\TestCase;
 use WooCommerce\Facebook\Admin\Settings_Screens\Shops;
diff --git a/tests/Unit/Api/REST/RestAPITest.php b/tests/Unit/Api/REST/RestAPITest.php
index f739e31cf..ba4f92313 100644
--- a/tests/Unit/Api/REST/RestAPITest.php
+++ b/tests/Unit/Api/REST/RestAPITest.php
@@ -3,7 +3,7 @@
  * Unit tests for REST API functionality.
  */
 
-namespace WooCommerce\Facebook\Tests\Unit\API\Plugin;
+namespace WooCommerce\Facebook\Tests\Api\REST;
 
 use WooCommerce\Facebook\API\Plugin\InitializeRestAPI;
 use WooCommerce\Facebook\API\Plugin\Settings\Handler;
diff --git a/tests/Unit/ApiTest.php b/tests/Unit/ApiTest.php
index df6064a7b..1a6a665d3 100644
--- a/tests/Unit/ApiTest.php
+++ b/tests/Unit/ApiTest.php
@@ -7,7 +7,7 @@
 /**
  * Api unit test clas.
  */
-class ApiTest extends \WooCommerce\Facebook\Tests\Unit\AbstractWPUnitTestWithSafeFiltering {
+class ApiTest extends \WooCommerce\Facebook\Tests\AbstractWPUnitTestWithSafeFiltering {
 
 	/**
 	 * Facebook Graph API endpoint.
diff --git a/tests/Unit/Feed/FeedUploadUtilsTest.php b/tests/Unit/Feed/FeedUploadUtilsTest.php
index c03ff9630..4d6fd0374 100644
--- a/tests/Unit/Feed/FeedUploadUtilsTest.php
+++ b/tests/Unit/Feed/FeedUploadUtilsTest.php
@@ -14,7 +14,7 @@
  *
  * Sets up environment to test various logic in FeedUploadUtils
  */
-class FeedUploadUtilsTest extends \WooCommerce\Facebook\Tests\Unit\AbstractWPUnitTestWithSafeFiltering {
+class FeedUploadUtilsTest extends \WooCommerce\Facebook\Tests\AbstractWPUnitTestWithSafeFiltering {
 
 	/** @var int Shop page ID */
 	protected static $shop_page_id;
diff --git a/tests/Unit/Framework/Utilities/AsyncRequestTest.php b/tests/Unit/Framework/Utilities/AsyncRequestTest.php
index 7ba463cb9..3e8a4d8ed 100644
--- a/tests/Unit/Framework/Utilities/AsyncRequestTest.php
+++ b/tests/Unit/Framework/Utilities/AsyncRequestTest.php
@@ -1,7 +1,7 @@
 <?php
 declare( strict_types=1 );
 
-namespace WooCommerce\Facebook\Tests\Unit\Framework\Utilities;
+namespace WooCommerce\Facebook\Tests\Framework\Utilities;
 
 use WooCommerce\Facebook\Framework\Utilities\AsyncRequest;
 use WP_UnitTestCase;
diff --git a/tests/Unit/Handlers/MetaExtensionTest.php b/tests/Unit/Handlers/MetaExtensionTest.php
index fb50e14e2..812985fa9 100644
--- a/tests/Unit/Handlers/MetaExtensionTest.php
+++ b/tests/Unit/Handlers/MetaExtensionTest.php
@@ -3,7 +3,7 @@
  * Unit tests for Meta Extension handler.
  */
 
-namespace WooCommerce\Facebook\Tests\Unit\Handlers;
+namespace WooCommerce\Facebook\Tests\Handlers;
 
 use WooCommerce\Facebook\Handlers\MetaExtension;
 use WP_UnitTestCase;
diff --git a/tests/Unit/WCFacebookCommerceIntegrationTest.php b/tests/Unit/WCFacebookCommerceIntegrationTest.php
index 3a2c301cf..b079af962 100644
--- a/tests/Unit/WCFacebookCommerceIntegrationTest.php
+++ b/tests/Unit/WCFacebookCommerceIntegrationTest.php
@@ -16,7 +16,7 @@
 /**
  * Unit tests for Facebook Graph API calls.
  */
-class WCFacebookCommerceIntegrationTest extends \WooCommerce\Facebook\Tests\Unit\AbstractWPUnitTestWithSafeFiltering {
+class WCFacebookCommerceIntegrationTest extends \WooCommerce\Facebook\Tests\AbstractWPUnitTestWithSafeFiltering {
 
 	/**
 	 * @var WC_Facebookcommerce
diff --git a/tests/Unit/WPMLTest.php b/tests/Unit/WPMLTest.php
index dd805d551..79931c7a6 100644
--- a/tests/Unit/WPMLTest.php
+++ b/tests/Unit/WPMLTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class WPMLTest extends \WooCommerce\Facebook\Tests\Unit\AbstractWPUnitTestWithSafeFiltering {
+class WPMLTest extends \WooCommerce\Facebook\Tests\AbstractWPUnitTestWithSafeFiltering {
 
 	/** @var int $fake_product_id */
 	private $fake_product_id = 1;
diff --git a/tests/Unit/fbproductTest.php b/tests/Unit/fbproductTest.php
index 6781e919c..40e34b427 100644
--- a/tests/Unit/fbproductTest.php
+++ b/tests/Unit/fbproductTest.php
@@ -2,7 +2,7 @@
 declare(strict_types=1);
 
 
-class fbproductTest extends \WooCommerce\Facebook\Tests\Unit\AbstractWPUnitTestWithSafeFiltering {
+class fbproductTest extends \WooCommerce\Facebook\Tests\AbstractWPUnitTestWithSafeFiltering {
 	private $parent_fb_product;
 
 	/** @var \WC_Product_Simple */