diff --git a/app/etc/di.xml b/app/etc/di.xml
index 2828a238c267109889f56b72ce95b243b22fb051..2bd37564a597a04ee61b90d2e0e70602a0e62a4b 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -154,7 +154,7 @@
     <preference for="Magento\Framework\EntityManager\MapperInterface" type="Magento\Framework\EntityManager\CompositeMapper"/>
     <preference for="Magento\Framework\Console\CommandListInterface" type="Magento\Framework\Console\CommandList"/>
     <preference for="Magento\Framework\DataObject\IdentityGeneratorInterface" type="Magento\Framework\DataObject\IdentityService" />
-    <preference for="Magento\Framework\Serialize\SerializerInterface" type="Magento\Framework\Serialize\Json" />
+    <preference for="Magento\Framework\Serialize\SerializerInterface" type="Magento\Framework\Serialize\Serializer\Json" />
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
     <type name="Magento\Framework\Logger\Handler\Base">
         <arguments>
diff --git a/lib/internal/Magento/Framework/Serialize/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
similarity index 79%
rename from lib/internal/Magento/Framework/Serialize/Json.php
rename to lib/internal/Magento/Framework/Serialize/Serializer/Json.php
index 7b5f8a2006bbb236d523af87e196c6b87515bbcc..009fee5e3639f5ab5cd8cf9e1031f4a4129d98b4 100644
--- a/lib/internal/Magento/Framework/Serialize/Json.php
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
@@ -3,7 +3,9 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Serialize;
+namespace Magento\Framework\Serialize\Serializer;
+
+use Magento\Framework\Serialize\SerializerInterface;
 
 class Json implements SerializerInterface
 {
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/JsonTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
similarity index 62%
rename from lib/internal/Magento/Framework/Serialize/Test/Unit/JsonTest.php
rename to lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
index add2f60d44c6e9fc6393873419515539cf2c6143..1f36b7b729e9beaa9dc5bf00ee97b0e81748853a 100644
--- a/lib/internal/Magento/Framework/Serialize/Test/Unit/JsonTest.php
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
@@ -3,15 +3,14 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Serialize\Test\Unit;
+namespace Magento\Framework\Serialize\Test\Unit\Serializer;
 
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\Serialize\Json;
+use Magento\Framework\Serialize\Serializer\Json;
 
 class JsonTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Serialize\Json
+     * @var \Magento\Framework\Serialize\Serializer\Json
      */
     private $json;
 
@@ -22,11 +21,11 @@ class JsonTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @param null|bool|array|\stdClass $value
+     * @param null|bool|array $value
      * @param int $objectDecodeType
-     * @dataProvider encodeDecodeDataProvider
+     * @dataProvider serializeUnserializeDataProvider
      */
-    public function testEncodeDecode($value)
+    public function testSerializeUnserialize($value)
     {
         $this->assertEquals(
             $this->json->unserialize($this->json->serialize($value)),
@@ -34,10 +33,8 @@ class JsonTest extends \PHPUnit_Framework_TestCase
         );
     }
 
-    public function encodeDecodeDataProvider()
+    public function serializeUnserializeDataProvider()
     {
-        $object = new \stdClass();
-        $object->a = 'b';
         return [
             [''],
             [null],