diff --git a/framework/cli/commands/shell/ModelCommand.php b/framework/cli/commands/shell/ModelCommand.php
index 0792e6eb8..3534f568b 100644
--- a/framework/cli/commands/shell/ModelCommand.php
+++ b/framework/cli/commands/shell/ModelCommand.php
@@ -24,6 +24,13 @@ class ModelCommand extends CConsoleCommand
 	 * Defaults to null, meaning using 'framework/cli/views/shell/model/model.php'.
 	 */
 	public $templateFile;
+	/**
+	 * @var string the directory that contains templates for the model command.
+	 * Defaults to null, meaning using 'framework/cli/views/shell/model'.
+	 * If you set this path and some views are missing in the directory,
+	 * the default views will be used.
+	 */
+	public $templatePath;
 
 	private $_schema;
 	private $_relations; // where we keep table relations
@@ -232,7 +239,7 @@ EOD;
 	 * @param string the word to be pluralized
 	 * @return string the pluralized word
 	 */
-	protected function pluralize($name)
+	public function pluralize($name)
 	{
 		$rules=array(
 			'/(x|ch|ss|sh|us|as|is|os)$/i' => '\1es',
@@ -328,17 +335,31 @@ EOD;
 				return;
 		}
 
+		$templatePath=$this->templatePath===null?YII_PATH.'/cli/views/shell/model':$this->templatePath;
 		$list=array();
 		foreach ($this->_classes as $tableName=>$className)
 		{
 			$files[$className]=$classFile=$basePath.DIRECTORY_SEPARATOR.$className.'.php';
-			$templateFile=$this->templateFile===null?YII_PATH.'/cli/views/shell/model/model.php':$this->templateFile;
-			$list[$className.'.php']=array(
-				'source'=>$templateFile,
+			$list['models/'.$className.'.php']=array(
+				'source'=>$templatePath.DIRECTORY_SEPARATOR.'model.php',
 				'target'=>$classFile,
 				'callback'=>array($this,'generateModel'),
 				'params'=>array($className,$tableName),
 			);
+			$list['tests/fixtures/'.$tableName.'.php']=array(
+				'source'=>$templatePath.DIRECTORY_SEPARATOR.'fixture.php',
+				'target'=>Yii::getPathOfAlias('application.tests.fixtures').DIRECTORY_SEPARATOR.$tableName.'.php',
+				'callback'=>array($this,'generateFixture'),
+				'params'=>$this->_schema->getTable($tableName),
+			);
+			$fixtureName=$this->pluralize($className);
+			$fixtureName[0]=strtolower($fixtureName);
+			$list['tests/unit/'.$className.'Test.php']=array(
+				'source'=>$templatePath.DIRECTORY_SEPARATOR.'test.php',
+				'target'=>Yii::getPathOfAlias('application.tests.unit').DIRECTORY_SEPARATOR.$className.'Test.php',
+				'callback'=>array($this,'generateTest'),
+				'params'=>array($className,$fixtureName),
+			);
 		}
 
 		$this->copyFiles($list);
@@ -417,6 +438,8 @@ EOD;
 		else
 			echo "Warning: the table '$tableName' does not exist in the database.\n";
 
+		if(!is_file($source))  // fall back to default ones
+			$source=YII_PATH.'/cli/views/shell/model/'.basename($source);
 		return $this->renderFile($source,array(
 			'className'=>$className,
 			'tableName'=>$tableName,
@@ -426,4 +449,24 @@ EOD;
 			'relations'=>$relations,
 		),true);
 	}
+
+	public function generateFixture($source,$table)
+	{
+		if(!is_file($source))  // fall back to default ones
+			$source=YII_PATH.'/cli/views/shell/model/'.basename($source);
+		return $this->renderFile($source, array(
+			'table'=>$table,
+		),true);
+	}
+
+	public function generateTest($source,$params)
+	{
+		list($className,$fixtureName)=$params;
+		if(!is_file($source))  // fall back to default ones
+			$source=YII_PATH.'/cli/views/shell/model/'.basename($source);
+		return $this->renderFile($source, array(
+			'className'=>$className,
+			'fixtureName'=>$fixtureName,
+		),true);
+	}
 }
\ No newline at end of file
diff --git a/framework/cli/views/shell/model/fixture.php b/framework/cli/views/shell/model/fixture.php
new file mode 100644
index 000000000..a15958508
--- /dev/null
+++ b/framework/cli/views/shell/model/fixture.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * This is the template for generating the fixture file for a model class.
+ * The following variables are available in this template:
+ * - $table: the table schema
+ */
+?>
+<?php echo "<?php\n"; ?>
+
+return array(
+	/*
+	'sample1'=>array(
+<?php foreach($table->columns as $name=>$column) {
+	if($table->sequenceName===null || $table->primaryKey!==$column->name)
+		echo "\t\t'$name' => '',\n";
+} ?>
+	),
+	'sample2'=>array(
+<?php foreach($table->columns as $name=>$column) {
+	if($table->sequenceName===null || $table->primaryKey!==$column->name)
+		echo "\t\t'$name' => '',\n";
+} ?>
+	),
+	*/
+);
diff --git a/framework/cli/views/shell/model/test.php b/framework/cli/views/shell/model/test.php
new file mode 100644
index 000000000..93aa17e81
--- /dev/null
+++ b/framework/cli/views/shell/model/test.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * This is the template for generating the unit test for a model class.
+ * The following variables are available in this template:
+ * - $className: the class name
+ * - $fixtureName: the fixture name
+ */
+?>
+<?php echo "<?php\n"; ?>
+
+class <?php echo $className; ?>Test extends CDbTestCase
+{
+	public $fixtures=array(
+		'<?php echo $fixtureName; ?>'=>'<?php echo $className; ?>',
+	);
+
+	public function testCreate()
+	{
+
+	}
+}
\ No newline at end of file