diff --git a/lib/Cake/Console/Command/Task/ModelTask.php b/lib/Cake/Console/Command/Task/ModelTask.php
index fc184c54b..1cfd0eac4 100644
--- a/lib/Cake/Console/Command/Task/ModelTask.php
+++ b/lib/Cake/Console/Command/Task/ModelTask.php
@@ -20,6 +20,7 @@
 App::uses('BakeTask', 'Console/Command/Task');
 App::uses('ConnectionManager', 'Model');
 App::uses('Model', 'Model');
+App::uses('Validation', 'Utility');
 
 /**
  * Task class for creating and updating model files.
diff --git a/lib/Cake/Console/Command/Task/PluginTask.php b/lib/Cake/Console/Command/Task/PluginTask.php
index 37ea34f67..a08212423 100644
--- a/lib/Cake/Console/Command/Task/PluginTask.php
+++ b/lib/Cake/Console/Command/Task/PluginTask.php
@@ -18,6 +18,7 @@
  */
 
 App::uses('File', 'Utility');
+App::uses('Folder', 'Utility');
 
 /**
  * Task class for creating a plugin
diff --git a/lib/Cake/tests/cases/console/shells/tasks/model.test.php b/lib/Cake/tests/cases/console/shells/tasks/model.test.php
index 2ec7b62af..470496e06 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/model.test.php
+++ b/lib/Cake/tests/cases/console/shells/tasks/model.test.php
@@ -21,6 +21,8 @@
 
 App::uses('ShellDispatcher', 'Console');
 App::uses('Shell', 'Console');
+App::uses('ConsoleOutput', 'Console');
+App::uses('ConsoleInput', 'Console');
 App::uses('FixtureTask', 'Console/Command/Task');
 App::uses('TemplateTask', 'Console/Command/Task');
 App::uses('ModelTask', 'Console/Command/Task');
diff --git a/lib/Cake/tests/cases/console/shells/tasks/plugin.test.php b/lib/Cake/tests/cases/console/shells/tasks/plugin.test.php
index 89922043f..a46465857 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/plugin.test.php
+++ b/lib/Cake/tests/cases/console/shells/tasks/plugin.test.php
@@ -20,9 +20,12 @@
  */
 
 App::uses('ShellDispatcher', 'Console');
+App::uses('ConsoleOutput', 'Console');
+App::uses('ConsoleInput', 'Console');
 App::uses('Shell', 'Console');
 App::uses('PluginTask', 'Console/Command/Task');
 App::uses('ModelTask', 'Console/Command/Task');
+App::uses('Folder', 'Utility');
 App::uses('File', 'Utility');
 
 /**