diff --git a/module/my/control.php b/module/my/control.php
index a88b54769a..cc7e21db48 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -223,7 +223,7 @@ class my extends control
      * @access public
      * @return void
      */
-    public function testtask($orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function testtask($type = 'wait', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -236,12 +236,13 @@ class my extends control
 
         $this->view->title      = $this->lang->my->common . $this->lang->colon . $this->lang->my->testTask;
         $this->view->position[] = $this->lang->my->testTask;
-        $this->view->tasks      = $this->loadModel('testtask')->getByUser($this->app->user->account, $pager, $orderBy);
+        $this->view->tasks      = $this->loadModel('testtask')->getByUser($this->app->user->account, $pager, $orderBy, $type);
         
         $this->view->recTotal   = $recTotal;
         $this->view->recPerPage = $recPerPage;
         $this->view->pageID     = $pageID;
         $this->view->orderBy    = $orderBy;
+        $this->view->type       = $type;
         $this->view->pager      = $pager;
         $this->display();
 
@@ -263,6 +264,7 @@ class my extends control
         /* Save session, load lang. */
         $this->session->set('caseList', $this->app->getURI(true));
         $this->app->loadLang('testcase');
+        $this->app->loadLang('testtask');
         
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index 7abcb814ed..7873fa56f4 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -16,7 +16,8 @@
 <div id='featurebar'>
   <nav class='nav'>
     <?php
-    echo "<li id='testtask'>"      . html::a($this->createLink('my', 'testtask'),  $lang->my->testTask) . "</li>";
+    echo "<li id='waitTesttask'>"  . html::a($this->createLink('my', 'testtask', 'type=wait'),  $lang->testtask->wait) . "</li>";
+    echo "<li id='doneTesttask'>"  . html::a($this->createLink('my', 'testtask', 'type=done'),  $lang->testtask->done) . "</li>";
     echo "<li id='assigntomeTab'>" . html::a($this->createLink('my', 'testcase', "type=assigntome"),  $lang->testcase->assignToMe) . "</li>";
     echo "<li id='openedbymeTab'>" . html::a($this->createLink('my', 'testcase', "type=openedbyme"),  $lang->testcase->openedByMe) . "</li>";
     ?>
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index b1b92e2f55..64abcec73c 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -15,14 +15,15 @@
 <div id='featurebar'>
   <nav class='nav'>
     <?php
-    echo "<li id='testtaskTab'>"   . html::a($this->createLink('my', 'testtask'),  $lang->my->testTask) . "</li>";
+    echo "<li id='waitTesttask'>"  . html::a($this->createLink('my', 'testtask', 'type=wait'),  $lang->testtask->wait) . "</li>";
+    echo "<li id='doneTesttask'>"  . html::a($this->createLink('my', 'testtask', 'type=done'),  $lang->testtask->done) . "</li>";
     echo "<li id='assigntomeTab'>" . html::a($this->createLink('my', 'testcase', "type=assigntome"),  $lang->testcase->assignToMe) . "</li>";
     echo "<li id='closedbymeTab'>" . html::a($this->createLink('my', 'testcase', "type=openedbyme"),  $lang->testcase->openedByMe) . "</li>";
     ?>
   </nav>
 </div>
 <table class='table table-condensed table-hover table-striped tablesorter' id='taskList'>
-  <?php $vars = "orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
+  <?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
   <thead>
   <tr class='text-center'>
     <th class='w-id'>  <?php common::printOrderLink('id',      $orderBy, $vars, $lang->idAB);?></th>
@@ -63,5 +64,5 @@
   </tbody>
   <tfoot><tr><td colspan='8'><?php $pager->show();?></td></tr></tfoot>
 </table>
-<script language="Javascript">$("#testtaskTab").addClass('active'); </script>
+<script language="Javascript">$("#<?php echo $type;?>Testtask").addClass('active'); </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 226fd49d86..1305b4575b 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -30,6 +30,8 @@ $lang->testtask->pre            = 'Previous';
 $lang->testtask->next           = 'Next';
 $lang->testtask->start          = "Start";
 $lang->testtask->close          = "Close";
+$lang->testtask->wait           = "Testing task";
+$lang->testtask->done           = "Tested task";
 
 $lang->testtask->common         = 'Test task';
 $lang->testtask->id             = 'ID';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index c908599bb0..78d0bab1f5 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -30,6 +30,8 @@ $lang->testtask->pre            = '上一个';
 $lang->testtask->next           = '下一个';
 $lang->testtask->start          = "开始";
 $lang->testtask->close          = "关闭";
+$lang->testtask->wait           = "待测版本";
+$lang->testtask->done           = "已测版本";
 
 $lang->testtask->common         = '测试任务';
 $lang->testtask->id             = '任务编号';
diff --git a/module/testtask/model.php b/module/testtask/model.php
index b8ee5d4cce..979e6558e0 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -125,7 +125,7 @@ class testtaskModel extends model
      * @access  public
      * @return  array
      */
-    public function getByUser($account, $pager = null, $orderBy = 'id_desc')
+    public function getByUser($account, $pager = null, $orderBy = 'id_desc', $type = '')
     {
         return $this->dao->select('t1.*, t2.name AS projectName, t3.name AS buildName')
             ->from(TABLE_TESTTASK)->alias('t1')
@@ -133,6 +133,8 @@ class testtaskModel extends model
             ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build = t3.id')
             ->where('t1.deleted')->eq(0)
             ->andWhere('t1.owner')->eq($account)
+            ->beginIF($type == 'wait')->andWhere('t1.status')->ne('done')->fi()
+            ->beginIF($type == 'done')->andWhere('t1.status')->eq('done')->fi()
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll();