diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php
index 579fb058e01af166d8f154610729b52bd6c13c93..25c4330d93bb176831ed0092563bff1f35c7566d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php
@@ -8,7 +8,7 @@
 namespace Magento\Test\Integrity;
 
 use Magento\Framework\App\Utility\Files;
-use Magento\Tools\Dependency\Circular;
+use Magento\Setup\Module\Dependency\Circular;
 
 class CircularDependencyTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php b/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
index 023677f588606634f109ea0fc1e4674fedac052a..ab64345470ab8e8e1912855699f3bbb6ba76e0eb 100644
--- a/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AbstractDependenciesCommand.php
@@ -28,7 +28,8 @@ abstract class AbstractDependenciesCommand extends Command
      */
     protected function configure()
     {
-        $this->setDefinition([
+        $this->setDefinition(
+            [
                 new InputOption(
                     self::INPUT_KEY_DIRECTORY,
                     'd',