diff --git a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
index c2af57533502d..9bfcc344b1db6 100644
--- a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
@@ -3,6 +3,9 @@ app/code/Magento/Customer/view/frontend/web/js/zxcvbn.js
 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-bundle.js
 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui-standalone-preset.js
 
+// MINIFIED FILES
+app/code/**/*.min.js
+
 // TO REFACTORING
 app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js
 app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
index f80151a41573d..4911670e099c2 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
@@ -6,5 +6,6 @@
 return [
     '/\.(jpe?g|png|gif|ttf|swf|eot|woff|pdf|mp3|pdf|jar|jbf)$/',
     '/pub\/opt\/magento\/var/',
-    '/COPYING\.txt/'
+    '/COPYING\.txt/',
+    '/app\/code\/(?!Magento)[^\/]*/'
 ];
diff --git a/dev/tools/grunt/tools/collect-validation-files.js b/dev/tools/grunt/tools/collect-validation-files.js
index 7347898c5b8fc..15fb5e50be0a2 100644
--- a/dev/tools/grunt/tools/collect-validation-files.js
+++ b/dev/tools/grunt/tools/collect-validation-files.js
@@ -3,10 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
 'use strict';
 
 var glob = require('glob'),
@@ -29,17 +25,27 @@ module.exports = {
     getFilesForValidate: function () {
         var blackListFiles = glob.sync(pc.static.blacklist + '*.txt'),
             whiteListFiles = glob.sync(pc.static.whitelist + '*.txt'),
-            blackList = this.readFiles(blackListFiles),
-            whiteList = this.readFiles(whiteListFiles),
-            files = [];
+            blackList = this.readFiles(blackListFiles).filter(this.isListEntryValid),
+            whiteList = this.readFiles(whiteListFiles).filter(this.isListEntryValid),
+            files = [],
+            entireBlackList = [];
+
+        fst.arrayRead(blackList, function (data) {
+            entireBlackList = _.union(entireBlackList, data);
+        });
 
         fst.arrayRead(whiteList, function (data) {
-            files = _.difference(data, blackList);
+            files = _.difference(data, entireBlackList);
         });
 
         return files;
     },
 
+    isListEntryValid: function(line) {
+        line = line.trim();
+        return line.length > 0 && line.startsWith('// ') !== true;
+    },
+
     getFiles: function (file) {
         if (file) {
             return file.split(',');