diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index cb32e80ab9..2d4612607b 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -114,7 +114,7 @@ js::set('cancelURL',      $this->createLink('testtask', 'batchRun', "productID=$
         </thead>
         <tbody>
           <?php foreach($cases as $case):?>
-          <tr data-id='<?php echo $case->id?>'>
+          <tr data-id='<?php echo $case->id?>' data-auto='<?php echo $case->auto;?>'>
             <?php foreach($setting as $key => $value) $this->testcase->printCell($value, $case, $users, $branchOption, $modulePairs, $browseType, $useDatatable ? 'datatable' : 'table');?>
           </tr>
           <?php $caseProductIds[$case->product] = $case->product;?>
@@ -308,6 +308,18 @@ function runAutocase()
 
 function confirmAction(obj)
 {
+    var autoRun = 'no';
+    $.each($('input[name^=caseIDList]:checked'),function(){
+       var dataAuto = $(this).parents('tr').attr('data-auto');
+       if(dataAuto == 'auto') autoRun = dataAuto;
+    });
+
+    if(autoRun == 'no')
+    {
+        setFormAction(cancelURL, '', '#caseList');
+        return false;
+    }
+
     if(confirm(runCaseConfirm))
     {
         var result = runAutocase();
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index b815ae3f01..fac5a942b4 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -75,7 +75,7 @@
           <?php if($cases):?>
           <tbody>
             <?php foreach($cases as $case):?>
-            <tr>
+            <tr data-auto='<?php echo $case->auto;?>'>
               <td class='c-id'>
                 <?php if($hasCheckbox):?>
                 <?php echo html::checkbox('caseIDList', array($case->id => sprintf('%03d', $case->id)));?>
@@ -188,6 +188,18 @@ function runAutocase()
 
 function confirmAction(obj)
 {
+    var autoRun = 'no';
+    $.each($('input[name^=caseIDList]:checked'),function(){
+       var dataAuto = $(this).parents('tr').attr('data-auto');
+       if(dataAuto == 'auto') autoRun = dataAuto;
+    });
+
+    if(autoRun == 'no')
+    {
+        setFormAction(cancelURL, '', '#caseList');
+        return false;
+    }
+
     if(confirm(runCaseConfirm))
     {
         var result = runAutocase();
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php
index f9a8c1c812..922df9f8fa 100644
--- a/module/testtask/view/batchrun.html.php
+++ b/module/testtask/view/batchrun.html.php
@@ -30,6 +30,7 @@
         </tr>
       </thead>
       <?php foreach($cases as $caseID => $case):?>
+      <?php if($case->auto == 'auto' and $confirm == 'yes') continue;?>
       <?php if($case->status == 'wait') continue;?>
       <?php if(!$productID) echo html::hidden("caseIDList[$case->id]", $caseID); ?>
       <tr class='text-center'>
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 4bd6e18c1c..0c7fe28e26 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -74,7 +74,7 @@
           </thead>
           <tbody>
             <?php foreach($runs as $run):?>
-            <tr data-id='<?php echo $run->id?>'>
+            <tr data-id='<?php echo $run->id?>' data-auto='<?php echo $run->auto;?>'>
               <?php foreach($setting as $key => $value) $this->testtask->printCell($value, $run, $users, $task, $branches, $useDatatable ? 'datatable' : 'table');?>
             </tr>
             <?php endforeach;?>
@@ -189,6 +189,18 @@ function runAutocase()
 
 function confirmAction(obj)
 {
+    var autoRun = 'no';
+    $.each($('input[name^=caseIDList]:checked'),function(){
+       var dataAuto = $(this).parents('tr').attr('data-auto');
+       if(dataAuto == 'auto') autoRun = dataAuto;
+    });
+
+    if(autoRun == 'no')
+    {
+        setFormAction(cancelURL, '', '#caseList');
+        return false;
+    }
+
     if(confirm(runCaseConfirm))
     {
         var result = runAutocase();
diff --git a/module/zanode/control.php b/module/zanode/control.php
index d2ba5e5188..22846440d1 100644
--- a/module/zanode/control.php
+++ b/module/zanode/control.php
@@ -404,6 +404,7 @@ class zanode extends control
 
             foreach($cases as $id => $case)
             {
+                if($case->auto != 'auto') continue;
                 $resultID = $this->loadModel('testtask')->initResult(0, $id, $case->version, $script->node);
                 if(!dao::isError()) $this->zanode->runZTFScript($script->id, $id, $resultID);
             }