diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Admin/ItemTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Admin/ItemTest.php
index 1ab18014dd023b1c32bba51e4d43b64a61ecb22a..e5bfaa4fa3efd7dbad0726d06976f98a61cbdf93 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Admin/ItemTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Admin/ItemTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sales\Model\Order\Admin;
+namespace Magento\Sales\Test\Unit\Model\Order\Admin;
 
 /**
  * Class ValidatorTest
@@ -18,9 +18,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Sales\Model\Order\Admin\Item */
     protected $item;
 
-    /**
-     * Mock order address model
-     */
+
     public function setUp()
     {
         $this->orderItemMock = $this->getMockBuilder('Magento\Sales\Model\Order\Item')
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/ItemTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/ItemTest.php
index e0b353a025d94cc74fd8168229c4567af0cef88d..95021f082666e488d122e0148ca3e981b580ae52 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/ItemTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/ItemTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sales\Model\Order\Creditmemo;
+namespace Magento\Sales\Test\Unit\Model\Order\Creditmemo;
 
 use Magento\Sales\Api\Data\CreditmemoItemInterface;
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/CostTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/CostTest.php
index e6ea89cc220c197395e65c86e7570c62d1bc3cdf..1841b489d9c18d7eb8ed87664c4281db56d08668 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/CostTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/CostTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Sales\Model\Order\Creditmemo\Total;
+namespace Magento\Sales\Test\Unit\Model\Order\Creditmemo\Total;
 
 /**
  * Class CostTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php
index 4aa6012eb9a1fa2710b31ac9222d00fc09a51c2f..96c05732d3c569357ccd99b40d410f8066b3303f 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Sales\Model\Order\Creditmemo\Total;
+namespace Magento\Sales\Test\Unit\Model\Order\Creditmemo\Total;
 
 /**
  * Class DiscountTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/SubtotalTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/SubtotalTest.php
index 619ec8dc3e1b6090539205448dfd606e76c8639c..3a766b863e9fc5119e644ff66ec103d8f3e3402f 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/SubtotalTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/SubtotalTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Sales\Model\Order\Creditmemo\Total;
+namespace Magento\Sales\Test\Unit\Model\Order\Creditmemo\Total;
 
 /**
  * Class SubtotalTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Grid/Massaction/ItemsUpdaterTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Grid/Massaction/ItemsUpdaterTest.php
index f6791d195a64405c8717b46f04edbfea93ac927f..8726d814b06c0c60bd7448766540340873be2b4e 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Grid/Massaction/ItemsUpdaterTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Grid/Massaction/ItemsUpdaterTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Sales\Model\Order\Grid\Massaction;
+namespace Magento\Sales\Test\Unit\Model\Order\Grid\Massaction;
 
 class ItemsUpdaterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Grid/Row/UrlGeneratorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Grid/Row/UrlGeneratorTest.php
index 51dcfffa426d1a1cb3864ada8a8edcec5e1cd797..f3a4cb2c8522472dc0f956c603df410141eb7bff 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Grid/Row/UrlGeneratorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Grid/Row/UrlGeneratorTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Sales\Model\Order\Grid\Row;
+namespace Magento\Sales\Test\Unit\Model\Order\Grid\Row;
 
 class UrlGeneratorTest extends  \PHPUnit_Framework_TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Grid/Row/UrlGeneratorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Grid/Row/UrlGeneratorTest.php
index da887207e65feb7b1827c929a05fc107cf973931..2eeebb26091585fc321c61cc039b4b34ababb04a 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Grid/Row/UrlGeneratorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Grid/Row/UrlGeneratorTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Sales\Model\Order\Invoice\Grid\Row;
+namespace Magento\Sales\Test\Unit\Model\Order\Invoice\Grid\Row;
 
 class UrlGeneratorTest extends  \PHPUnit_Framework_TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/ItemTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/ItemTest.php
index 18c31b96e07e2fc85a510dc9560464c9f91ffb27..0303f1855ee3c5759b31f03a77ab4843e29692e1 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/ItemTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/ItemTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Sales\Model\Order\Invoice;
+namespace Magento\Sales\Test\Unit\Model\Order\Invoice;
 
 class ItemTest extends \PHPUnit_Framework_TestCase
 {