diff --git a/src/Shell/Task/ModelTask.php b/src/Shell/Task/ModelTask.php
index 5cb9ddf34..9905410e1 100644
--- a/src/Shell/Task/ModelTask.php
+++ b/src/Shell/Task/ModelTask.php
@@ -684,11 +684,13 @@ public function bakeTable($model, array $data = [])
         }
 
         $name = $model->alias();
+        $entity = $this->_entityName($model->alias());
         $data += [
             'plugin' => $this->plugin,
             'pluginPath' => $pluginPath,
             'namespace' => $ns,
             'name' => $name,
+            'entity' => $entity,
             'associations' => [],
             'primaryKey' => 'id',
             'displayField' => null,
diff --git a/src/Template/Bake/Model/table.ctp b/src/Template/Bake/Model/table.ctp
index 0650101cc..59e19c932 100644
--- a/src/Template/Bake/Model/table.ctp
+++ b/src/Template/Bake/Model/table.ctp
@@ -17,10 +17,18 @@ use Cake\Utility\Inflector;
 <?php
 namespace <%= $namespace %>\Model\Table;
 
-use Cake\ORM\Query;
-use Cake\ORM\RulesChecker;
-use Cake\ORM\Table;
-use Cake\Validation\Validator;
+<%
+$uses = [
+    "use $namespace\\Model\\Entity\\$entity;",
+    'use Cake\ORM\Query;',
+    'use Cake\ORM\RulesChecker;',
+    'use Cake\ORM\Table;',
+    'use Cake\Validation\Validator;'
+];
+sort($uses);
+echo implode("\n", $uses);
+%>
+
 
 /**
  * <%= $name %> Model
diff --git a/tests/comparisons/Model/testBakeTableConfig.php b/tests/comparisons/Model/testBakeTableConfig.php
index 1bf3aa7dc..d84353490 100644
--- a/tests/comparisons/Model/testBakeTableConfig.php
+++ b/tests/comparisons/Model/testBakeTableConfig.php
@@ -1,6 +1,7 @@
 <?php
 namespace App\Model\Table;
 
+use App\Model\Entity\BakeArticle;
 use Cake\ORM\Query;
 use Cake\ORM\RulesChecker;
 use Cake\ORM\Table;
diff --git a/tests/comparisons/Model/testBakeTableRelations.php b/tests/comparisons/Model/testBakeTableRelations.php
index d9a04e162..14d27863b 100644
--- a/tests/comparisons/Model/testBakeTableRelations.php
+++ b/tests/comparisons/Model/testBakeTableRelations.php
@@ -1,6 +1,7 @@
 <?php
 namespace App\Model\Table;
 
+use App\Model\Entity\BakeArticle;
 use Cake\ORM\Query;
 use Cake\ORM\RulesChecker;
 use Cake\ORM\Table;
diff --git a/tests/comparisons/Model/testBakeTableValidation.php b/tests/comparisons/Model/testBakeTableValidation.php
index 150f52126..c4c29c372 100644
--- a/tests/comparisons/Model/testBakeTableValidation.php
+++ b/tests/comparisons/Model/testBakeTableValidation.php
@@ -1,6 +1,7 @@
 <?php
 namespace App\Model\Table;
 
+use App\Model\Entity\BakeArticle;
 use Cake\ORM\Query;
 use Cake\ORM\RulesChecker;
 use Cake\ORM\Table;
diff --git a/tests/comparisons/Model/testBakeTableWithPlugin.php b/tests/comparisons/Model/testBakeTableWithPlugin.php
index 5333a6dfb..be6ff768b 100644
--- a/tests/comparisons/Model/testBakeTableWithPlugin.php
+++ b/tests/comparisons/Model/testBakeTableWithPlugin.php
@@ -5,6 +5,7 @@
 use Cake\ORM\RulesChecker;
 use Cake\ORM\Table;
 use Cake\Validation\Validator;
+use ModelTest\Model\Entity\BakeArticle;
 
 /**
  * BakeArticles Model
diff --git a/tests/comparisons/Model/testBakeWithRules.php b/tests/comparisons/Model/testBakeWithRules.php
index 16fbc1ce4..4daa58753 100644
--- a/tests/comparisons/Model/testBakeWithRules.php
+++ b/tests/comparisons/Model/testBakeWithRules.php
@@ -1,6 +1,7 @@
 <?php
 namespace App\Model\Table;
 
+use App\Model\Entity\User;
 use Cake\ORM\Query;
 use Cake\ORM\RulesChecker;
 use Cake\ORM\Table;