diff --git a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
index 6bc4c9d5f212c93f1a0235d1ebf91ad505af677c..35cdbd21e46dc3fa5390de8b39c4a0bbe2423b03 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
@@ -15,6 +15,7 @@ use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
  * Class LinkManagementTest
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class LinkManagementTest extends \PHPUnit_Framework_TestCase
 {
@@ -39,7 +40,7 @@ class LinkManagementTest extends \PHPUnit_Framework_TestCase
     protected $linkFactory;
 
     /**
-     * @var \Magento\Bundle\Model\Product\Type\Interceptor|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Catalog\Model\Product\Type\Interceptor|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $productType;
 
diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/DownloadableTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/DownloadableTest.php
index dba46e81bcc5b6e3ebce2d02ec095a4e540b4208..d16dc21ba23e68260ea1cf348c2ee67457987308 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/DownloadableTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/DownloadableTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Downloadable\Test\Unit\Controller\Adminhtml\Product\Initialization\Helper\Plugin;
 
+use Magento\Catalog\Api\Data\ProductExtensionInterface;
+
 class DownloadableTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -59,13 +61,10 @@ class DownloadableTest extends \PHPUnit_Framework_TestCase
             '',
             false
         );
-        $this->extensionAttributesMock = $this->getMock(
-            'Magento\Catalog\Api\Data\ProductExtensionInterface',
-            ['setDownloadableProductSamples', 'setDownloadableProductLinks'],
-            [],
-            '',
-            false
-        );
+        $this->extensionAttributesMock = $this->getMockBuilder(ProductExtensionInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setDownloadableProductSamples', 'setDownloadableProductLinks'])
+            ->getMockForAbstractClass();
         $this->sampleFactoryMock = $this->getMockBuilder('\Magento\Downloadable\Api\Data\SampleInterfaceFactory')
             ->disableOriginalConstructor()
             ->setMethods(['create'])
diff --git a/lib/internal/Magento/Framework/App/Action/Plugin/Design.php b/lib/internal/Magento/Framework/App/Action/Plugin/Design.php
index 84eb05feb1b732fd0ae73e19ff3b3b9ec56955de..6bd2ee59c477ed1a0cfb6f529d6119e8d33aa670 100644
--- a/lib/internal/Magento/Framework/App/Action/Plugin/Design.php
+++ b/lib/internal/Magento/Framework/App/Action/Plugin/Design.php
@@ -24,7 +24,6 @@ class Design
      * Initialize design
      *
      * @param \Magento\Framework\App\ActionInterface $subject
-     * @param callable $proceed
      * @param \Magento\Framework\App\RequestInterface $request
      *
      * @return mixed
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/Plugin/DesignTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/Plugin/DesignTest.php
index 2e86c5da43189b005ce24c123f2b342338ac8f06..6fc92474c7059546ca934b011ae3528755855a31 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Action/Plugin/DesignTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Action/Plugin/DesignTest.php
@@ -11,12 +11,9 @@ class DesignTest extends \PHPUnit_Framework_TestCase
     {
         $subjectMock = $this->getMock('Magento\Framework\App\Action\Action', [], [], '', false);
         $designLoaderMock = $this->getMock('Magento\Framework\View\DesignLoader', [], [], '', false);
-        $closureMock = function () {
-            return 'Expected';
-        };
         $requestMock = $this->getMock('Magento\Framework\App\RequestInterface');
         $plugin = new \Magento\Framework\App\Action\Plugin\Design($designLoaderMock);
         $designLoaderMock->expects($this->once())->method('load');
-        $this->assertEquals('Expected', $plugin->aroundDispatch($subjectMock, $closureMock, $requestMock));
+        $plugin->beforeDispatch($subjectMock, $requestMock);
     }
 }
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Select/SelectRendererTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Select/SelectRendererTest.php
index c8e171bde344596e4fc67bb4ae7b4489033cf8f2..d293b2dee3d024e203db2860680c6b986aeba93d 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Select/SelectRendererTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Select/SelectRendererTest.php
@@ -13,9 +13,9 @@ class SelectRendererTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
         $renders = [
-            ['renderer' => $rendererOne, 'sort' => 10],
-            ['renderer' => $rendererOne, 'sort' => 20],
-            ['renderer' => $rendererOne, 'sort' => 5],
+            ['renderer' => $rendererOne, 'sort' => 10, 'part' => 'from'],
+            ['renderer' => $rendererOne, 'sort' => 20, 'part' => 'from'],
+            ['renderer' => $rendererOne, 'sort' => 5, 'part' => 'from'],
         ];
         $selectMock = $this->getMockBuilder('Magento\Framework\DB\Select')
             ->disableOriginalConstructor()