diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
index f947b55c93fbd65ed4c4906edff87f49ff96533b..23fcd366b3325a1789c9c05f5645ffdc91603ad1 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
@@ -68,9 +68,17 @@ class CompilerTest extends \PHPUnit_Framework_TestCase
         $basePath = \Magento\Framework\App\Utility\Files::init()->getPathToSource();
         $basePath = str_replace('\\', '/', $basePath);
 
+
         $this->_tmpDir = realpath(__DIR__) . '/tmp';
         $this->_generationDir = $this->_tmpDir . '/generation';
+        if (!file_exists($this->_generationDir)) {
+            mkdir($this->_generationDir, 0777, true);
+        }
         $this->_compilationDir = $this->_tmpDir . '/di';
+        if (!file_exists($this->_compilationDir)) {
+            mkdir($this->_compilationDir, 0777, true);
+        }
+
         $this->_command = 'php ' . $basePath . '/bin/magento setup:di:compile-multi-tenant --generation=%s --di=%s';
 
         $booleanUtils = new \Magento\Framework\Stdlib\BooleanUtils();
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
index e533f7650ca4f05ccf354db2114adfbc45c02b37..6f37a57c9c00c20a9935ce1f5f223ebcefff582d 100644
--- a/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
@@ -160,7 +160,7 @@ class DiCompileMultiTenantCommand extends AbstractSetupCommand
             "#^" . $this->directoryList->getRoot() . "/dev/tools/Magento/Tools/[\\w]+/Test#"
         ];
         $fileExcludePatterns = $input->getOption('exclude-pattern') ?
-            [$input->getOption(self::INPUT_KEY_EXCLUDE_PATTERN)] : ['#[\\\\/]m1[\\\\/]#i'];
+            [$input->getOption(self::INPUT_KEY_EXCLUDE_PATTERN)] : ['#[\\\\/]M1[\\\\/]#i'];
         $fileExcludePatterns = array_merge($fileExcludePatterns, $testExcludePatterns);
         /** @var Writer\Console logWriter Writer model for success messages */
         $logWriter = new Writer\Console($output);