diff --git a/module/testreport/view/browse.html.php b/module/testreport/view/browse.html.php
index f1fc7e0d55..f31529e013 100644
--- a/module/testreport/view/browse.html.php
+++ b/module/testreport/view/browse.html.php
@@ -35,7 +35,9 @@
         <th class='text-left'><?php common::printOrderLink('title',     $orderBy, $vars, $lang->testreport->title);?></th>
         <th class='w-user'> <?php common::printOrderLink('createdBy',   $orderBy, $vars, $lang->openedByAB);?></th>
         <th class='w-150px'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->testreport->createdDate);?></th>
+        <?php if($config->global->flow != 'onlyTest'):?>
         <th class='w-250px text-left'><?php common::printOrderLink('project', $orderBy, $vars, $lang->testreport->project);?></th>
+        <?php endif;?>
         <th class='w-250px text-left'><?php echo $lang->testreport->testtask;?></th>
         <th class='c-actions-2'> <?php echo $lang->actions;?></th>
       </tr>
@@ -48,8 +50,10 @@
         <td class='text-left' title='<?php $report->title?>'><?php echo html::a(inlink('view', "reportID=$report->id&from=$objectType"), $report->title)?></td>
         <td><?php echo zget($users, $report->createdBy);?></td>
         <td><?php echo substr($report->createdDate, 2);?></td>
-        <?php $projectName = '#' . $report->project . $projects[$report->project];?>
+        <?php if($config->global->flow != 'onlyTest'):?>
+        <?php $projectName = $report->project ? '#' . $report->project . $projects[$report->project] : '';?>
         <td class='text-left' title='<?php echo $projectName?>'><?php echo $projectName;?></td>
+        <?php endif;?>
         <?php
         $taskName = '';
         foreach(explode(',', $report->tasks) as $taskID) $taskName .= '#' . $taskID . $tasks[$taskID] . ' ';
diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php
index 01d2360bc9..2847237173 100644
--- a/module/testreport/view/create.html.php
+++ b/module/testreport/view/create.html.php
@@ -32,7 +32,7 @@
                   <span class='input-group-addon'> ~ </span>
                   <?php echo html::input('end', $end, "class='form-control form-date'")?>
                   <?php
-                  echo html::hidden('product', $productIdList) . html::hidden('project', $project->id) . html::hidden('tasks', $tasks);
+                  echo html::hidden('product', $productIdList) . ($config->global->flow != 'onlyTest' ? html::hidden('project', $project->id) : '') . html::hidden('tasks', $tasks);
                   echo html::hidden('objectID', $objectID) . html::hidden('objectType', $objectType);
                   ?>
                 </div>
@@ -55,11 +55,13 @@
               <td colspan='2'><?php echo html::input('title', $reportTitle, "class='form-control'")?></td>
               <td></td>
             </tr>
+            <?php if($config->global->flow != 'onlyTest'):?>
             <tr>
               <th><?php echo $lang->testreport->goal?></th>
               <td colspan='2'><?php echo $project->desc?></td>
               <td></td>
             </tr>
+            <?php endif;?>
             <tr>
               <th><?php echo $lang->testreport->profile?></th>
               <td colspan='2'>
diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php
index 0489536984..69e11fcbb3 100644
--- a/module/testreport/view/edit.html.php
+++ b/module/testreport/view/edit.html.php
@@ -31,9 +31,7 @@
                 <?php echo html::input('begin', $report->begin, "class='form-control form-date'")?>
                 <span class='input-group-addon'> ~ </span>
                 <?php echo html::input('end', $report->end, "class='form-control form-date'")?>
-                <?php
-                echo html::hidden('product', $productIdList) . html::hidden('project', $report->project) . html::hidden('tasks', $tasks);
-                ?>
+                <?php echo html::hidden('product', $productIdList) . ($config->global->flow != 'onlyTest' ? html::hidden('project', $project->id) : '') . html::hidden('tasks', $tasks);?>
               </div>
             </td>
             <td>
@@ -54,11 +52,13 @@
             <td colspan='2'><?php echo html::input('title', $report->title, "class='form-control'")?></td>
             <td></td>
           </tr>
+          <?php if($config->global->flow != 'onlyTest'):?>
           <tr>
             <th><?php echo $lang->testreport->goal?></th>
             <td colspan='2'><?php echo $project->desc?></td>
             <td></td>
           </tr>
+          <?php endif;?>
           <tr>
             <th><?php echo $lang->testreport->profile?></th>
             <td colspan='2'>
diff --git a/module/testreport/view/view.html.php b/module/testreport/view/view.html.php
index 42427735bf..9e0fd5ba65 100644
--- a/module/testreport/view/view.html.php
+++ b/module/testreport/view/view.html.php
@@ -60,10 +60,12 @@
           <th><?php echo $lang->testreport->members?></th>
           <td colspan='2'><?php foreach(explode(',', $report->members) as $member)echo zget($users, $member) . ' &nbsp; ';?></td>
         </tr>
+        <?php if($config->global->flow != 'onlyTest' && !empty($project)):?>
         <tr>
           <th><?php echo $lang->testreport->goal?></th>
           <td colspan='2'><?php echo $project->desc?></td>
         </tr>
+        <?php endif;?>
         <tr>
           <th><?php echo $lang->testreport->profile?></th>
           <td colspan='2'>