diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/DeployStaticContentCommandTest.php b/app/code/Magento/Deploy/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
index c8fa2138e7c81fb69d562fb5ec55e049cb5deabc..6f6f564b5bd42c95a9300bc929b159b3d9a82eb0 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Deploy\Test\Unit\Console\Command;
 
-use Magento\Deploy\Console\Command\DeployStaticContentCommand;
+use Magento\Setup\Console\Command\DeployStaticContentCommand;
 use Symfony\Component\Console\Tester\CommandTester;
 use Magento\Framework\Validator\Locale;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php
index 7d611de8bf6169b27328add86572e0bc12a860e5..d4404ce320de5445834ee98cc4df18b28677e48e 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php
@@ -156,8 +156,6 @@ class WriterTest extends \PHPUnit_Framework_TestCase
 
         $testSetExpected = [
             ConfigFilePool::APP_CONFIG => [
-                'foo' => 'bar',
-                'key' => 'value',
                 'baz' => [
                     'test' => 'value2',
                 ]
@@ -167,8 +165,6 @@ class WriterTest extends \PHPUnit_Framework_TestCase
         $this->deploymentConfig->expects($this->once())->method('resetData');
         $this->configFilePool->expects($this->once())->method('getPaths')->willReturn($configFiles);
         $this->dirWrite->expects($this->any())->method('isExist')->willReturn(true);
-        $this->reader->expects($this->once())->method('load')
-            ->willReturn($testSetExisting[ConfigFilePool::APP_CONFIG]);
         $this->formatter
             ->expects($this->once())
             ->method('format')