diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 5a347d243b..123667524a 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -50,6 +50,7 @@ $lang->testtask->unlinkedCases = 'Unlinked cases';
 $lang->testtask->linkedCases   = 'Linked cases';
 $lang->testtask->confirmDelete = 'Are you sure to delete this test task?';
 $lang->testtask->passAll       = 'Pass all';
+$lang->testtask->pass          = 'Pass';
 
 $lang->testtask->byModule      = 'By module';
 $lang->testtask->assignedToMe  = 'Assgined to me';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 5bf61f024b..5f6dbad531 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -50,6 +50,7 @@ $lang->testtask->unlinkedCases = '未关联用例列表';
 $lang->testtask->linkedCases   = '已关联用例列表';
 $lang->testtask->confirmDelete = '您确认要删除该测试任务吗？';
 $lang->testtask->passAll       = '全部通过';
+$lang->testtask->pass          = '通过';
 
 $lang->testtask->byModule      = '按模块';
 $lang->testtask->assignedToMe  = '指派给我';
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 0168cb7ada..60f04d93f7 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -219,11 +219,18 @@ class testtaskModel extends model
         }
 
         /* Create result of every step. */
-        foreach($this->post->steps as $stepID =>$stepResult)
+        if(isset($this->post->steps))
         {
-            $step['result'] = $stepResult;
-            $step['real']   = $this->post->reals[$stepID];
-            $stepResults[$stepID] = $step;
+            foreach($this->post->steps as $stepID =>$stepResult)
+            {
+                $step['result'] = $stepResult;
+                $step['real']   = $this->post->reals[$stepID];
+                $stepResults[$stepID] = $step;
+            }
+        }
+        else
+        {
+            $stepResults = array();
         }
 
         /* Pares the extras */
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index f47ca97a40..7553e433b3 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -38,8 +38,15 @@
     <tr class='a-center'>
       <td colspan='5'>
         <?php
-        echo html::submitButton();
-        echo html::submitButton($lang->testtask->passAll, "onclick=$('#passall').val(1)");
+        if(empty($run->case->steps))
+        {
+            echo html::submitButton($lang->testtask->pass, "onclick=$('#passall').val(1)");
+        }
+        else
+        {
+            echo html::submitButton();
+            echo html::submitButton($lang->testtask->passAll, "onclick=$('#passall').val(1)");
+        }
         echo html::hidden('case', $run->case->id);
         echo html::hidden('version', $run->case->version);
         echo html::hidden('passall', 0);