diff --git a/module/project/ui/bug.html.php b/module/project/ui/bug.html.php
index a8eca255c2..8a760e7cb1 100644
--- a/module/project/ui/bug.html.php
+++ b/module/project/ui/bug.html.php
@@ -18,6 +18,7 @@ featureBar
     li(searchToggle(set::module('projectBug'), set::open($type == 'bysearch')))
 );
 
+$canCreate = (common::canModify('project', $project) && hasPriv('bug', 'create'));
 toolbar
 (
     hasPriv('bug', 'export') ? item(set(array
@@ -28,7 +29,7 @@ toolbar
         'url'   => createLink('bug', 'export', "productID={$productID}&orderBy=$orderBy&browseType=&projectID={$project->id}"),
         'data-toggle' => 'modal'
     ))) : null,
-    (common::canModify('project', $project) && hasPriv('bug', 'create')) ? item(set(array
+    $canCreate ? item(set(array
     (
         'text' => $lang->bug->create,
         'icon' => 'plus',
@@ -93,6 +94,9 @@ dtable
     set::sortLink(createLink('project', 'bug', "projectID={$project->id}&productID={$productID}&branchID={$branchID}&orderBy={name}_{sortType}&build={$buildID}&type={$type}&param={$param}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
     set::footToolbar($footToolbar),
     set::footPager(usePager()),
+    set::emptyTip($lang->bug->notice->noBug),
+    set::createTip($lang->bug->create),
+    set::createLink($canCreate ? createLink('bug', 'create', "productID={$productID}&branch={$branchID}&extras=projectID={$project->id}") : '')
 );
 
 render();
diff --git a/module/project/ui/testtask.html.php b/module/project/ui/testtask.html.php
index f9684d5248..56253c0d97 100644
--- a/module/project/ui/testtask.html.php
+++ b/module/project/ui/testtask.html.php
@@ -27,9 +27,10 @@ featureBar
     )
 );
 
+$canCreate = common::canModify('project', $project) && common::hasPriv('testtask', 'create');
 toolbar
 (
-    common::canModify('project', $project) && common::hasPriv('testtask', 'create') ? btn
+    $canCreate ? btn
     (
         setClass('btn primary'),
         set::icon('plus'),
@@ -74,6 +75,9 @@ dtable
         'linkCreator' => helper::createLink('project', 'testtask', "projectID={$project->id}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={recPerPage}&page={page}")
     ))),
     set::checkInfo(jsRaw('function(checkedIDList){return window.setStatistics(this, checkedIDList);}')),
+    set::emptyTip($lang->testtask->noTesttask),
+    set::createTip($lang->testtask->create),
+    set::createLink($canCreate ? createLink('testtask', 'create', "product=0&executionID=0&build=0&projectID={$project->id}") : '')
 );
 
 render();