diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/DeployStaticContentCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
similarity index 99%
rename from app/code/Magento/Deploy/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
rename to setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
index 6f6f564b5bd42c95a9300bc929b159b3d9a82eb0..82777bb6b7aee697ba5a77df1a9dfcc95d93dedc 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Deploy\Test\Unit\Console\Command;
+namespace Magento\Setup\Test\Unit\Console\Command;
 
 use Magento\Setup\Console\Command\DeployStaticContentCommand;
 use Symfony\Component\Console\Tester\CommandTester;
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/FunctionExistMock.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/FunctionExistMock.php
similarity index 100%
rename from app/code/Magento/Deploy/Test/Unit/Console/Command/FunctionExistMock.php
rename to setup/src/Magento/Setup/Test/Unit/Console/Command/FunctionExistMock.php