diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php
index 0bbeaec11a17480dd391008cc3f9aaf23f0d1039..d15295f9fef8d396fb8aeef7b04fafe5a9ffc38a 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php
@@ -39,6 +39,7 @@ class IoTest extends \PHPUnit_Framework_TestCase
 
     /** @var string */
     protected $existingFile;
+
     /** @var string */
     protected $nonExistingFile;
 
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
index c418cb713b76f3275c349f6a2ae3168d616fa0cd..c53a0973b0070cce60863a74c3eb988955444e75 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -31,15 +31,13 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
     ];
 
     /**
-     * Model under test
+     * System under test
      *
      * @var \Magento\Framework\Code\Generator
      */
     protected $model;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Io
-     */
+    /** @var \PHPUnit_Framework_MockObject_MockObject|Io */
     protected $ioObjectMock;
 
     /** @var \Magento\Framework\Code\Generator\DefinedClasses | \PHPUnit_Framework_MockObject_MockObject */
@@ -62,11 +60,6 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
         );
     }
 
-    protected function tearDown()
-    {
-        unset($this->model);
-    }
-
     public function testGetGeneratedEntities()
     {
         $this->model = $this->buildModel(