diff --git a/module/metric/calc/system/scale/count_of_tested_story.php b/module/metric/calc/system/scale/count_of_tested_story.php
index 3175ef2e0d..28b80b6c9c 100644
--- a/module/metric/calc/system/scale/count_of_tested_story.php
+++ b/module/metric/calc/system/scale/count_of_tested_story.php
@@ -28,7 +28,7 @@ class count_of_tested_story extends baseCalc
 
     public function calculate($row)
     {
-        if($row->stage == 'tested') $this->result ++;
+        if(strpos(',tested,verified,rejected,delivering,delivered,released,closed', ",$row->stage,") !== false) $this->result ++;
     }
 
     public function getResult($options = array())
diff --git a/module/metric/calc/system/scale/scale_of_tested_story.php b/module/metric/calc/system/scale/scale_of_tested_story.php
index 079626d10e..5b4d656df3 100644
--- a/module/metric/calc/system/scale/scale_of_tested_story.php
+++ b/module/metric/calc/system/scale/scale_of_tested_story.php
@@ -31,7 +31,7 @@ class scale_of_tested_story extends baseCalc
         if($row->isParent == '1') return false;
         if(empty($row->estimate)) return null;
 
-        if($row->stage == 'tested') $this->result += $row->estimate;
+        if(strpos(',tested,verified,rejected,delivering,delivered,released,closed', ",$row->stage,") !== false) $this->result += $row->estimate;
     }
 
     public function getResult($options = array())