diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
index fe31088e..c7df570c 100644
--- a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
+++ b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -64,7 +64,10 @@ public function process(File $phpcsFile, $stackPtr)
             }
         }
 
-        if (preg_match('/(sql|data)/', $fileInfo->getPath()) === 1) {
+        $folders = array_filter(explode('/', $fileInfo->getPath()));
+        $folderName = array_pop($folders);
+
+        if ($folderName === 'data' || $folderName === 'sql') {
             $phpcsFile->addError(
                 $fileInfo->getFilename()." is in an invalid directory ".$fileInfo->getPath().":\n"
                 . "- Create a data patch within module's Setup/Patch/Data folder for data upgrades.\n"
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-data-folder/file3.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-data-folder/file3.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-data-folder/file3.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-sql-folder/file4.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-sql-folder/file4.inc
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-sql-folder/file4.inc
@@ -0,0 +1 @@
+<?php