diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a00c8873fb..688b97cc6a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,7 +9,7 @@
 >
     <testsuites>
         <testsuite name="Sylius Test Suite">
-            <directory>src/*/Bundle/*Bundle/Tests</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
@@ -17,16 +17,4 @@
         <server name="KERNEL_CLASS_PATH" value="/app/TestKernel.php" />
         <server name="IS_DOCTRINE_ORM_SUPPORTED" value="true" />
     </php>
-
-    <filter>
-        <whitelist>
-            <directory>src</directory>
-            <exclude>
-                <directory>src/*/*Bundle/Resources</directory>
-                <directory>src/*/*Bundle/Tests</directory>
-                <directory>src/*/Bundle/*Bundle/Resources</directory>
-                <directory>src/*/Bundle/*Bundle/Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
 </phpunit>
diff --git a/src/Sylius/Bundle/ApiBundle/composer.json b/src/Sylius/Bundle/ApiBundle/composer.json
index ad194b81c3..262087471e 100644
--- a/src/Sylius/Bundle/ApiBundle/composer.json
+++ b/src/Sylius/Bundle/ApiBundle/composer.json
@@ -29,7 +29,7 @@
     "require-dev": {
         "doctrine/orm": "^2.4",
         "phpspec/phpspec": "^2.4",
-        "phpunit/phpunit": "~3.7",
+        "phpunit/phpunit": "^4.8",
         "symfony/form": "^2.7",
         "twig/twig": "^1.0"
     },
diff --git a/src/Sylius/Bundle/ChannelBundle/composer.json b/src/Sylius/Bundle/ChannelBundle/composer.json
index 9097ed8c67..c1c423b6d8 100644
--- a/src/Sylius/Bundle/ChannelBundle/composer.json
+++ b/src/Sylius/Bundle/ChannelBundle/composer.json
@@ -29,7 +29,7 @@
     "require-dev": {
         "matthiasnoback/symfony-dependency-injection-test": "^0.7.6",
         "phpspec/phpspec": "^2.4",
-        "phpunit/phpunit": "^4.1",
+        "phpunit/phpunit": "^4.8",
         "symfony/form": "^2.7",
         "twig/twig": "^1.0"
     },
diff --git a/src/Sylius/Bundle/CoreBundle/.gitignore b/src/Sylius/Bundle/CoreBundle/.gitignore
index 46aed33710..ae840f0924 100644
--- a/src/Sylius/Bundle/CoreBundle/.gitignore
+++ b/src/Sylius/Bundle/CoreBundle/.gitignore
@@ -1,5 +1,8 @@
-vendor/
-bin/
+/vendor/
+/bin/
 
-composer.phar
-composer.lock
+/composer.phar
+/composer.lock
+
+/phpunit.xml
+/phpspec.yml
diff --git a/src/Sylius/Bundle/CoreBundle/composer.json b/src/Sylius/Bundle/CoreBundle/composer.json
index 601e79f1e6..6bcc80d766 100644
--- a/src/Sylius/Bundle/CoreBundle/composer.json
+++ b/src/Sylius/Bundle/CoreBundle/composer.json
@@ -64,11 +64,9 @@
         "winzou/state-machine-bundle": "~0.2"
     },
     "require-dev": {
+        "matthiasnoback/symfony-dependency-injection-test": "^0.7",
         "phpspec/phpspec": "^2.4",
-        "fzaninotto/faker": "~1.2",
-        "symfony/form": "^2.7",
-        "lakion/api-test-case": "^1.0@dev",
-        "coduo/php-matcher": "^2.1@dev"
+        "phpunit/phpunit": "^4.8"
     },
     "suggest": {
         "sylius/web-bundle": "Provides default web interface",
diff --git a/src/Sylius/Bundle/CoreBundle/phpunit.xml.dist b/src/Sylius/Bundle/CoreBundle/phpunit.xml.dist
new file mode 100644
index 0000000000..6d32a7c173
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/phpunit.xml.dist
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+>
+    <testsuites>
+        <testsuite name="Sylius Test Suite">
+            <directory>./Tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./Tests</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Controller/CountryApiTest.php b/tests/Controller/CountryApiTest.php
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Controller/CountryApiTest.php
rename to tests/Controller/CountryApiTest.php
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Controller/CurrencyApiTest.php b/tests/Controller/CurrencyApiTest.php
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Controller/CurrencyApiTest.php
rename to tests/Controller/CurrencyApiTest.php
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Controller/CustomerApiTest.php b/tests/Controller/CustomerApiTest.php
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Controller/CustomerApiTest.php
rename to tests/Controller/CustomerApiTest.php
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Controller/LocaleApiTest.php b/tests/Controller/LocaleApiTest.php
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Controller/LocaleApiTest.php
rename to tests/Controller/LocaleApiTest.php
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Controller/ProvinceApiTest.php b/tests/Controller/ProvinceApiTest.php
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Controller/ProvinceApiTest.php
rename to tests/Controller/ProvinceApiTest.php
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Controller/ShippingCategoryApiTest.php b/tests/Controller/ShippingCategoryApiTest.php
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Controller/ShippingCategoryApiTest.php
rename to tests/Controller/ShippingCategoryApiTest.php
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Controller/SitemapControllerApiTest.php b/tests/Controller/SitemapControllerApiTest.php
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Controller/SitemapControllerApiTest.php
rename to tests/Controller/SitemapControllerApiTest.php
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Controller/TaxCategoryApiTest.php b/tests/Controller/TaxCategoryApiTest.php
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Controller/TaxCategoryApiTest.php
rename to tests/Controller/TaxCategoryApiTest.php
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/authentication/api_administrator.yml b/tests/DataFixtures/ORM/authentication/api_administrator.yml
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/authentication/api_administrator.yml
rename to tests/DataFixtures/ORM/authentication/api_administrator.yml
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/countries.yml b/tests/DataFixtures/ORM/resources/countries.yml
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/countries.yml
rename to tests/DataFixtures/ORM/resources/countries.yml
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/currencies.yml b/tests/DataFixtures/ORM/resources/currencies.yml
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/currencies.yml
rename to tests/DataFixtures/ORM/resources/currencies.yml
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/customers.yml b/tests/DataFixtures/ORM/resources/customers.yml
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/customers.yml
rename to tests/DataFixtures/ORM/resources/customers.yml
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/locales.yml b/tests/DataFixtures/ORM/resources/locales.yml
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/locales.yml
rename to tests/DataFixtures/ORM/resources/locales.yml
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/product.yml b/tests/DataFixtures/ORM/resources/product.yml
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/product.yml
rename to tests/DataFixtures/ORM/resources/product.yml
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/shipping_categories.yml b/tests/DataFixtures/ORM/resources/shipping_categories.yml
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/shipping_categories.yml
rename to tests/DataFixtures/ORM/resources/shipping_categories.yml
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/tax_categories.yml b/tests/DataFixtures/ORM/resources/tax_categories.yml
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/tax_categories.yml
rename to tests/DataFixtures/ORM/resources/tax_categories.yml
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/tax_categories_for_filtering.yml b/tests/DataFixtures/ORM/resources/tax_categories_for_filtering.yml
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/DataFixtures/ORM/resources/tax_categories_for_filtering.yml
rename to tests/DataFixtures/ORM/resources/tax_categories_for_filtering.yml
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/authentication/access_denied_response.json b/tests/Responses/Expected/authentication/access_denied_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/authentication/access_denied_response.json
rename to tests/Responses/Expected/authentication/access_denied_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/country/create_response.json b/tests/Responses/Expected/country/create_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/country/create_response.json
rename to tests/Responses/Expected/country/create_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/country/create_validation_fail_response.json b/tests/Responses/Expected/country/create_validation_fail_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/country/create_validation_fail_response.json
rename to tests/Responses/Expected/country/create_validation_fail_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/country/index_response.json b/tests/Responses/Expected/country/index_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/country/index_response.json
rename to tests/Responses/Expected/country/index_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/country/show_response.json b/tests/Responses/Expected/country/show_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/country/show_response.json
rename to tests/Responses/Expected/country/show_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/currency/create_response.json b/tests/Responses/Expected/currency/create_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/currency/create_response.json
rename to tests/Responses/Expected/currency/create_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/currency/create_validation_fail_response.json b/tests/Responses/Expected/currency/create_validation_fail_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/currency/create_validation_fail_response.json
rename to tests/Responses/Expected/currency/create_validation_fail_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/currency/index_response.json b/tests/Responses/Expected/currency/index_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/currency/index_response.json
rename to tests/Responses/Expected/currency/index_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/currency/show_response.json b/tests/Responses/Expected/currency/show_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/currency/show_response.json
rename to tests/Responses/Expected/currency/show_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/currency/update_response.json b/tests/Responses/Expected/currency/update_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/currency/update_response.json
rename to tests/Responses/Expected/currency/update_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/currency/update_validation_fail_response.json b/tests/Responses/Expected/currency/update_validation_fail_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/currency/update_validation_fail_response.json
rename to tests/Responses/Expected/currency/update_validation_fail_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/create_response.json b/tests/Responses/Expected/customer/create_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/create_response.json
rename to tests/Responses/Expected/customer/create_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/create_validation_fail_response.json b/tests/Responses/Expected/customer/create_validation_fail_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/create_validation_fail_response.json
rename to tests/Responses/Expected/customer/create_validation_fail_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/create_with_user_response.json b/tests/Responses/Expected/customer/create_with_user_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/create_with_user_response.json
rename to tests/Responses/Expected/customer/create_with_user_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/create_with_user_validation_fail_response.json b/tests/Responses/Expected/customer/create_with_user_validation_fail_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/create_with_user_validation_fail_response.json
rename to tests/Responses/Expected/customer/create_with_user_validation_fail_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/index_response.json b/tests/Responses/Expected/customer/index_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/index_response.json
rename to tests/Responses/Expected/customer/index_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/partial_update_response.json b/tests/Responses/Expected/customer/partial_update_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/partial_update_response.json
rename to tests/Responses/Expected/customer/partial_update_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/show_response.json b/tests/Responses/Expected/customer/show_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/show_response.json
rename to tests/Responses/Expected/customer/show_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/show_with_user_response.json b/tests/Responses/Expected/customer/show_with_user_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/show_with_user_response.json
rename to tests/Responses/Expected/customer/show_with_user_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/update_response.json b/tests/Responses/Expected/customer/update_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/update_response.json
rename to tests/Responses/Expected/customer/update_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/update_validation_fail_response.json b/tests/Responses/Expected/customer/update_validation_fail_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/customer/update_validation_fail_response.json
rename to tests/Responses/Expected/customer/update_validation_fail_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/error/not_found_response.json b/tests/Responses/Expected/error/not_found_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/error/not_found_response.json
rename to tests/Responses/Expected/error/not_found_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/locale/create_response.json b/tests/Responses/Expected/locale/create_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/locale/create_response.json
rename to tests/Responses/Expected/locale/create_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/locale/create_validation_fail_response.json b/tests/Responses/Expected/locale/create_validation_fail_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/locale/create_validation_fail_response.json
rename to tests/Responses/Expected/locale/create_validation_fail_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/locale/index_response.json b/tests/Responses/Expected/locale/index_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/locale/index_response.json
rename to tests/Responses/Expected/locale/index_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/locale/show_response.json b/tests/Responses/Expected/locale/show_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/locale/show_response.json
rename to tests/Responses/Expected/locale/show_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/locale/update_response.json b/tests/Responses/Expected/locale/update_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/locale/update_response.json
rename to tests/Responses/Expected/locale/update_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/province/show_response.json b/tests/Responses/Expected/province/show_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/province/show_response.json
rename to tests/Responses/Expected/province/show_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/shipping_category/create_response.json b/tests/Responses/Expected/shipping_category/create_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/shipping_category/create_response.json
rename to tests/Responses/Expected/shipping_category/create_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/shipping_category/create_validation_fail_response.json b/tests/Responses/Expected/shipping_category/create_validation_fail_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/shipping_category/create_validation_fail_response.json
rename to tests/Responses/Expected/shipping_category/create_validation_fail_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/shipping_category/index_response.json b/tests/Responses/Expected/shipping_category/index_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/shipping_category/index_response.json
rename to tests/Responses/Expected/shipping_category/index_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/shipping_category/show_response.json b/tests/Responses/Expected/shipping_category/show_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/shipping_category/show_response.json
rename to tests/Responses/Expected/shipping_category/show_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/shipping_category/update_response.json b/tests/Responses/Expected/shipping_category/update_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/shipping_category/update_response.json
rename to tests/Responses/Expected/shipping_category/update_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/shipping_category/update_validation_fail_response.json b/tests/Responses/Expected/shipping_category/update_validation_fail_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/shipping_category/update_validation_fail_response.json
rename to tests/Responses/Expected/shipping_category/update_validation_fail_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/sitemap/show_sitemap.xml b/tests/Responses/Expected/sitemap/show_sitemap.xml
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/sitemap/show_sitemap.xml
rename to tests/Responses/Expected/sitemap/show_sitemap.xml
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/create_response.json b/tests/Responses/Expected/tax_category/create_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/create_response.json
rename to tests/Responses/Expected/tax_category/create_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/create_validation_fail_response.json b/tests/Responses/Expected/tax_category/create_validation_fail_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/create_validation_fail_response.json
rename to tests/Responses/Expected/tax_category/create_validation_fail_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/filtered_by_code_index_response.json b/tests/Responses/Expected/tax_category/filtered_by_code_index_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/filtered_by_code_index_response.json
rename to tests/Responses/Expected/tax_category/filtered_by_code_index_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/filtered_by_name_index_response.json b/tests/Responses/Expected/tax_category/filtered_by_name_index_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/filtered_by_name_index_response.json
rename to tests/Responses/Expected/tax_category/filtered_by_name_index_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/index_response.json b/tests/Responses/Expected/tax_category/index_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/index_response.json
rename to tests/Responses/Expected/tax_category/index_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/partial_update_response.json b/tests/Responses/Expected/tax_category/partial_update_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/partial_update_response.json
rename to tests/Responses/Expected/tax_category/partial_update_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/show_response.json b/tests/Responses/Expected/tax_category/show_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/show_response.json
rename to tests/Responses/Expected/tax_category/show_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/sorted_index_response.json b/tests/Responses/Expected/tax_category/sorted_index_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/sorted_index_response.json
rename to tests/Responses/Expected/tax_category/sorted_index_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/update_response.json b/tests/Responses/Expected/tax_category/update_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/update_response.json
rename to tests/Responses/Expected/tax_category/update_response.json
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/update_validation_fail_response.json b/tests/Responses/Expected/tax_category/update_validation_fail_response.json
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Tests/Responses/Expected/tax_category/update_validation_fail_response.json
rename to tests/Responses/Expected/tax_category/update_validation_fail_response.json