diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/AreaTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/AreaTest.php
index 5008df621503b55d22198ad7abb673412801d306..f4a83fd3a97acfdfe3f08be0ce55ce51b4bc13ac 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/AreaTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/AreaTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\App\Task;
+namespace Magento\Setup\Test\Unit\Module\Di\App\Task;
 
 use Magento\Framework\App;
 use Magento\Setup\Module\Di\App\Task\Operation\Area;
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/InterceptionCacheTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/InterceptionCacheTest.php
index 52dfd84df1bed698b95c89890353ae219a9a1144..a60932145180e39b0896a32146b9fbd62c1b6225 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/InterceptionCacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/InterceptionCacheTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\App\Task;
+namespace Magento\Setup\Test\Unit\Module\Di\App\Task;
 
 use Magento\Setup\Module\Di\App\Task\Operation\InterceptionCache;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
index a2b80faf5cb85c09f37ea14bafef715a63ce9cdd..9acc4b3cfdf35b66018b7edb0777b31031a56986 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\App\Task;
+namespace Magento\Setup\Test\Unit\Module\Di\App\Task;
 
 use Magento\Setup\Module\Di\App\Task\OperationFactory;
 use Magento\Setup\Module\Di\App\Task\OperationException;
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/RepositoryGeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/RepositoryGeneratorTest.php
index a90d2bba8df1a486cc12ecfbedc06ccc99ed2ab4..0b2b5310c67b2e57fd168ec618b3626397cce02e 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/RepositoryGeneratorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/RepositoryGeneratorTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\App\Task;
+namespace Magento\Setup\Test\Unit\Module\Di\App\Task;
 
 use Magento\Setup\Module\Di\App\Task\Operation\RepositoryGenerator;
 use Magento\Setup\Module\Di\Code\Scanner;
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Generator/InterceptionConfigurationBuilderTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Generator/InterceptionConfigurationBuilderTest.php
index d2720a472bed7d3d660593d7e796be56d73259e1..928afe76a0685ea8302b069ecbcc873782f51f99 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Generator/InterceptionConfigurationBuilderTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Generator/InterceptionConfigurationBuilderTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Code\Generator;
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Generator;
 
 use Magento\Framework\App\Interception\Cache\CompiledConfig;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassReaderDecoratorTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassReaderDecoratorTest.php
index be59c0c7cb00a07c51f0e9add298e607f3fd539a..9965a50ec82ca22cf0ad7dbcec589cd20a677378 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassReaderDecoratorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassReaderDecoratorTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Code\Reader;
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Reader;
 
 use Magento\Setup\Module\Di\Compiler\ConstructorArgument;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/AreaTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/AreaTest.php
index 9adc02ad411cab04abb48aab6c0304f18690c5d2..1ef35e58f13fdbf857f2d11975e2afd3662574cd 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/AreaTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/AreaTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Code\Reader\InstancesNamesList;
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Reader\InstancesNamesList;
 
 use \Magento\Setup\Module\Di\Code\Reader\Decorator\Area;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/DirectoryTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/DirectoryTest.php
index 0751f7148d731c1b014e7466b7446e74abcbcb6f..759f25d2a2499f62422aa8a381a8d9f2c9a97ad6 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/DirectoryTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/DirectoryTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Code\Reader\InstancesNamesList;
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Reader\InstancesNamesList;
 
 use Magento\Setup\Module\Di\Compiler\Log\Log;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/InterceptionsTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/InterceptionsTest.php
index 14f115251611ff90ebb82c8cf668df5106693bd0..b50cc6e71b012cdf2c1db79796903afe161ba94c 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/InterceptionsTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/InterceptionsTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Code\Reader\InstancesNamesList;
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Reader\InstancesNamesList;
 
 use Magento\Setup\Module\Di\Compiler\Log\Log;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/ArrayScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/ArrayScannerTest.php
index 6bfce635a18011040ad3230d988f6af835f60c82..b8891faf39af49dff6c725517556746baa8b4d04 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/ArrayScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/ArrayScannerTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Code\Scanner;
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Scanner;
 
 class ArrayScannerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/CompositeScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/CompositeScannerTest.php
index 426019885bf88d3a354ef99c6a9afa3247226ce4..e681c6d55d0864138f0ab41409deb07b6257a8b6 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/CompositeScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/CompositeScannerTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Code\Scanner;
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Scanner;
 
 class CompositeScannerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/DirectoryScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/DirectoryScannerTest.php
index fc3171c3f1b926feecafa4cc8566dd43fa7b126c..b44d3243065b6d44bbe8b2930f07c9a7740d9c5b 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/DirectoryScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/DirectoryScannerTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Code\Scanner;
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Scanner;
 
 class DirectoryScannerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
index f3c3ee4ce4d96ecd6be0863a9592ef13c366070e..6403592e0aaf10104226b39e593eede5e1090964 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Code\Scanner;
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Scanner;
 
 require_once __DIR__ . '/../../_files/app/code/Magento/SomeModule/Helper/Test.php';
 require_once __DIR__ . '/../../_files/app/code/Magento/SomeModule/ElementFactory.php';
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PluginScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PluginScannerTest.php
index ae5ae92b28b211fe097bec1b3acb39258c8b0bf8..1ac34de3b4296e4ef04dc875ce6a23c0ce3cfac5 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PluginScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PluginScannerTest.php
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Code\Scanner;
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Scanner;
 
 class PluginScannerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlInterceptorScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlInterceptorScannerTest.php
index ac12b282a8c84bcfc93053ce5d0cae704c38812f..7ac2c227a243ca07bc72274604595f0cca0fe1f7 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlInterceptorScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlInterceptorScannerTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Code\Scanner;
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Scanner;
 
 class XmlInterceptorScannerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlScannerTest.php
index b909cad63a5b45765a9310c17cc27f43f36e118e..71b447e1c644e7e9745ef66d3a51c269b54668d3 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlScannerTest.php
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Code\Scanner;
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Scanner;
 
 class XmlScannerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/ArgumentsResolverTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/ArgumentsResolverTest.php
index fdedce5e645b6b9c92d46d66b11e9faa1d04aa19..b0924f54d382aed67b96bd0aa3339344282363bb 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/ArgumentsResolverTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/ArgumentsResolverTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Compiler;
+namespace Magento\Setup\Test\Unit\Module\Di\Compiler;
 
 use Magento\Setup\Module\Di\Compiler\ConstructorArgument;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/ArgumentsSerializationTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/ArgumentsSerializationTest.php
index 78aadf7915dfa11fa9be30436d223caec7a33bec..01018b451e36d73943d90bf1a517cdc7353bbab9 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/ArgumentsSerializationTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/ArgumentsSerializationTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Compiler\Config\Chain;
+namespace Magento\Setup\Test\Unit\Module\Di\Compiler\Config\Chain;
 
 use \Magento\Setup\Module\Di\Compiler\Config\Chain\ArgumentsSerialization;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/BackslashTrimTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/BackslashTrimTest.php
index 8915785029589b3631206f332539a5ce67aeb04e..847a0f38627eb1494cb004f09b62c6cb773de0ef 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/BackslashTrimTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/BackslashTrimTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Compiler\Config\Chain;
+namespace Magento\Setup\Test\Unit\Module\Di\Compiler\Config\Chain;
 
 use \Magento\Setup\Module\Di\Compiler\Config\Chain\BackslashTrim;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/InterceptorSubstitutionTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/InterceptorSubstitutionTest.php
index ecfd87018927a13c6eae9cc9cd34953f90bc4e26..9376f8334a02dcb0455581513d591ff17a628c48 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/InterceptorSubstitutionTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/InterceptorSubstitutionTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Compiler\Config\Chain;
+namespace Magento\Setup\Test\Unit\Module\Di\Compiler\Config\Chain;
 
 use Magento\Setup\Module\Di\Compiler\Config\Chain\InterceptorSubstitution;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/PreferencesResolvingTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/PreferencesResolvingTest.php
index 84cb0d9068eaf7a4dcc44f782b30ae571439f7ed..c73ff5109d07ad3047aa7c01cd2cd3dc225a1504 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/PreferencesResolvingTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/PreferencesResolvingTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Compiler\Config\Chain;
+namespace Magento\Setup\Test\Unit\Module\Di\Compiler\Config\Chain;
 
 use Magento\Setup\Module\Di\Compiler\Config\Chain\PreferencesResolving;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php
index 33c8a9ab5131e79fa5ddcf67b14d7643e30ec5d1..42eebce83645b2e1d8cc2877f32e3479e2589e21 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ModificationChainTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Compiler\Config;
+namespace Magento\Setup\Test\Unit\Module\Di\Compiler\Config;
 
 use \Magento\Setup\Module\Di\Compiler\Config\ModificationChain;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ReaderTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ReaderTest.php
index 64a7a04496560ec27f78872dd6e332446b1b46ae..ff05209a0769d3ac1662d642f0b7f7cf871b031e 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ReaderTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/ReaderTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Compiler\Config;
+namespace Magento\Setup\Test\Unit\Module\Di\Compiler\Config;
 
 use Magento\Framework\App\Area;
 use Magento\Setup\Module\Di\Definition\Collection;
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/ConstructorArgumentTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/ConstructorArgumentTest.php
index 8e67ce5052e9df197485b4d19281f03b731c9037..4f574217b480c65f05f0089bbb6e8f4e2c325c1d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/ConstructorArgumentTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/ConstructorArgumentTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Compiler;
+namespace Magento\Setup\Test\Unit\Module\Di\Compiler;
 
 class ConstructorArgumentTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Definition/CollectionTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Definition/CollectionTest.php
index 773f7344c1d91ade06ecbd5e1723e4a4f96da94f..87821d22b1a1b7537d4580b737612d5974551d24 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Definition/CollectionTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Definition/CollectionTest.php
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-namespace Magento\Setup\Test\Unit\Module\Di\Test\Unit\Definition;
+namespace Magento\Setup\Test\Unit\Module\Di\Definition;
 
 /**
  * Class CollectionTest