diff --git a/Magento2/Sniffs/Classes/ObjectInstantiationSniff.php b/Magento2/Sniffs/Classes/ObjectInstantiationSniff.php
deleted file mode 100644
index 8077588c..00000000
--- a/Magento2/Sniffs/Classes/ObjectInstantiationSniff.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Copyright © Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento2\Sniffs\Classes;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Detects direct object instantiation via 'new' keyword.
- */
-class ObjectInstantiationSniff implements Sniff
-{
-    /**
-     * String representation of warning.
-     *
-     * phpcs:disable Magento2.Files.LineLength.MaxExceeded
-     *
-     * @var string
-     */
-    protected $warningMessage = 'Direct %s object instantiation is discouraged in Magento. Use dependency injection or factories instead.';
-    //phpcs:enable
-
-    /**
-     * Warning violation code.
-     *
-     * @var string
-     */
-    protected $warningCode = 'FoundDirectInstantiation';
-
-    /**
-     * List of tokens which declares left bound of current scope.
-     *
-     * @var array
-     */
-    protected $leftRangeTokens = [
-        T_WHITESPACE,
-        T_THROW
-    ];
-
-    /**
-     * List of tokens which declares right bound of current scope.
-     *
-     * @var array
-     */
-    protected $rightRangeTokens = [
-        T_STRING,
-        T_SELF,
-        T_STATIC,
-        T_VARIABLE,
-        T_NS_SEPARATOR
-    ];
-
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [T_NEW];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $leftLimit = $phpcsFile->findPrevious($this->leftRangeTokens, $stackPtr - 1, null, true);
-        $findThrow = $phpcsFile->findPrevious(T_THROW, $stackPtr - 1, $leftLimit);
-        if (!$findThrow) {
-            $classNameStart = $phpcsFile->findNext($this->rightRangeTokens, $stackPtr + 1);
-            $classNameEnd = $phpcsFile->findNext($this->rightRangeTokens, $classNameStart + 1, null, true);
-            $className = '';
-            for ($i = $classNameStart; $i < $classNameEnd; $i++) {
-                $className .= $tokens[$i]['content'];
-            }
-            $phpcsFile->addWarning(
-                $this->warningMessage,
-                $classNameStart,
-                $this->warningCode,
-                [$className]
-            );
-        }
-    }
-}
diff --git a/Magento2/Tests/Classes/ObjectInstantiationUnitTest.inc b/Magento2/Tests/Classes/ObjectInstantiationUnitTest.inc
deleted file mode 100644
index 4fd399ab..00000000
--- a/Magento2/Tests/Classes/ObjectInstantiationUnitTest.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-// not allowed
-$splInstance = new \SplFixedArray();
-
-$magentoNamespaceInstance = new Magento\Sales\Model\Order();
-
-$magentoInstance = new Order();
-
-$selfInstance = new self();
-
-$staticInstance = new static();
-
-//allowed
-if ($somethingBad === true) {
-    throw new \Magento\Framework\Exception\LocalizedException(__('Oops'));
-}
-
-if ($somethingVeryBad === true) {
-    throw new \Exception('Ooooops');
-}
diff --git a/Magento2/Tests/Classes/ObjectInstantiationUnitTest.php b/Magento2/Tests/Classes/ObjectInstantiationUnitTest.php
deleted file mode 100644
index b7e0b1c2..00000000
--- a/Magento2/Tests/Classes/ObjectInstantiationUnitTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright © Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento2\Tests\Classes;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Class ObjectInstantiationUnitTest
- */
-class ObjectInstantiationUnitTest extends AbstractSniffUnitTest
-{
-    /**
-     * @inheritdoc
-     */
-    public function getErrorList()
-    {
-        return [];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getWarningList()
-    {
-        return [
-            4 => 1,
-            6 => 1,
-            8 => 1,
-            10 => 1,
-            12 => 1,
-        ];
-    }
-}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 6cf09ab7..38b41d42 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -22,6 +22,7 @@
     <rule ref="Generic.PHP.NoSilencedErrors">
         <severity>10</severity>
         <type>error</type>
+        <exclude-pattern>*/lib/*</exclude-pattern>
     </rule>
     <rule ref="Generic.PHP.Syntax">
         <severity>10</severity>
@@ -89,6 +90,7 @@
         <severity>9</severity>
         <type>warning</type>
         <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Security.InsecureFunction">
         <severity>9</severity>
@@ -119,11 +121,6 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Magento2.Classes.ObjectInstantiation">
-        <severity>8</severity>
-        <type>warning</type>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-    </rule>
     <rule ref="Magento2.Exceptions.DirectThrow">
         <severity>8</severity>
         <type>warning</type>
@@ -141,8 +138,9 @@
     <rule ref="Magento2.Functions.StaticFunction">
         <severity>8</severity>
         <type>warning</type>
-        <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*/Setup/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Files.LineLength">
         <severity>8</severity>