diff --git a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
index accfc07301c21b33db6c320be413f385cd34e9b0..f50e79c9658b377c088ab51aed488d2494ee8f82 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -51,9 +51,7 @@ class OrderSaveTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->subjectMock = $this->getMockBuilder('\Magento\Sales\Api\Data\Order\Repository')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->subjectMock = $this->getMockForAbstractClass('\Magento\Sales\Api\OrderRepositoryInterface');
 
         $this->objectManagerHelper = new ObjectManager($this);
         $this->model = $this->objectManagerHelper->getObject(
@@ -84,14 +82,15 @@ class OrderSaveTest extends \PHPUnit_Framework_TestCase
 
     protected function setupExtensionAttributeMock()
     {
-        $orderExtensionAttributeMock = $this->getMockForAbstractClass(
-            '\Magento\Sales\Api\Data\OrderExtensionInterface',
-            [
-                'getAppliedTaxes',
-                'getConvertingFromQuote',
-                'getItemAppliedTaxes'
-            ]
-        );
+        $orderExtensionAttributeMock = $this->getMockBuilder('\Magento\Sales\Api\Data\OrderExtensionInterface')
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'getAppliedTaxes',
+                    'getConvertingFromQuote',
+                    'getItemAppliedTaxes',
+                ]
+            )->getMock();
 
         return $orderExtensionAttributeMock;
     }
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php b/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
index 7a091267baee1b3201d817b8facf2f223dd9b6bc..cc72250a496783692451f8c12ecc610f9de28d43 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
@@ -60,6 +60,20 @@ class ToOrderConverterTest extends \PHPUnit_Framework_TestCase
         );
     }
 
+    protected function setupOrderExtensionAttributeMock()
+    {
+        $orderExtensionAttributeMock = $this->getMockBuilder('\Magento\Sales\Api\Data\OrderExtensionInterface')
+            ->setMethods(
+                [
+                    'setAppliedTaxes',
+                    'setConvertingFromQuote',
+                    'setItemAppliedTaxes'
+                ]
+            )->getMock();
+
+        return $orderExtensionAttributeMock;
+    }
+
     /**
      * @dataProvider afterConvertDataProvider
      */
@@ -74,20 +88,12 @@ class ToOrderConverterTest extends \PHPUnit_Framework_TestCase
             ->method('getItemsAppliedTaxes')
             ->willReturn($itemsAppliedTaxes);
 
-        $orderExtensionAttributeMock = $this->getMockForAbstractClass(
-            '\Magento\Sales\Api\Data\OrderExtensionInterface',
-            [
-                'setAppliedTaxes',
-                'setConvertingFromQuote',
-                'setItemAppliedTaxes'
-            ]
-        );
-
-
         $orderMock = $this->getMockBuilder('\Magento\Sales\Model\Order')
             ->disableOriginalConstructor()
             ->getMock();
 
+        $orderExtensionAttributeMock = $this->setupOrderExtensionAttributeMock();
+
         $orderMock->expects($this->once())
             ->method('getExtensionAttributes')
             ->willReturn($orderExtensionAttributeMock);
@@ -122,16 +128,8 @@ class ToOrderConverterTest extends \PHPUnit_Framework_TestCase
             ->method('getItemsAppliedTaxes')
             ->willReturn($itemsAppliedTaxes);
 
-        $orderExtensionAttributeMock = $this->getMockForAbstractClass(
-            '\Magento\Sales\Api\Data\OrderExtensionInterface',
-            [
-                'setAppliedTaxes',
-                'setConvertingFromQuote',
-                'setItemAppliedTaxes'
-            ]
-        );
-
-
+        $orderExtensionAttributeMock = $this->setupOrderExtensionAttributeMock();
+        
         $orderMock = $this->getMockBuilder('\Magento\Sales\Model\Order')
             ->disableOriginalConstructor()
             ->getMock();