diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index a3560b2f26..fd603a43c5 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -654,18 +654,15 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
     unset($lang->project->menuOrder);
 
     /* Add bug, testcase and testtask module. */
-    $lang->menu->bug        = 'Bug|bug|index';
-    $lang->menu->testcase   = '用例|testcase|index';
-    $lang->menu->testtask   = '测试|testtask|index';
-    $lang->menu->testsuite  = '套件|testsuite|index';
-    $lang->menu->testreport = '报告|testreport|browse';
+    $lang->menu->bug      = 'Bug|bug|index';
+    $lang->menu->testcase = '用例|testcase|index';
+    $lang->menu->testtask = '测试|testtask|index';
+    $lang->menu->caselib  = '用例库|testsuite|library';
 
-    $lang->menuOrder[6]  = 'bug';
-    $lang->menuOrder[7]  = 'testcase';
-    $lang->menuOrder[8]  = 'testtask';
-    $lang->menuOrder[9]  = 'testsuite';
-    $lang->menuOrder[10] = 'testreport';
-    $lang->menuOrder[11] = 'product';
+    $lang->menuOrder[6] = 'bug';
+    $lang->menuOrder[7] = 'testcase';
+    $lang->menuOrder[8] = 'testtask';
+    $lang->menuOrder[9] = 'caselib';
 
     /* Adjust sub menu of bug module. */
     $lang->bug->menu = new stdclass();
@@ -679,45 +676,53 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
 
     /* Adjust sub menu of testcase. */
     $lang->testcase->menu = new stdclass();
-    $lang->testcase->menu->product  = '%s';
-    $lang->testcase->menu->browse   = array('link' => '浏览用例|testcase|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
-    $lang->testcase->menu->create   = array('link' => '创建用例|testcase|create|productID=%s');
+    $lang->testcase->menu->product   = '%s';
+    $lang->testcase->menu->browse    = array('link' => '浏览用例|testcase|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
+    $lang->testcase->menu->testsuite = array('link' => '浏览套件|testsuite|browse|productID=%s', 'alias' => 'linkcase,create,edit,view');
 
     $lang->testcase->menuOrder[5]  = 'product';
     $lang->testcase->menuOrder[10] = 'browse';
-    $lang->testcase->menuOrder[15] = 'create';
+    $lang->testcase->menuOrder[15] = 'testsuite';
+
+    /* Adjust sub menu of bug module. */
+    $lang->testsuite->menu = new stdclass();
+    $lang->testsuite->menu->product  = '%s';
+    $lang->testsuite->menu->testcase = array('link' => '浏览用例|testcase|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
+    $lang->testsuite->menu->browse   = array('link' => '浏览套件|testsuite|browse|productID=%s', 'alias' => 'linkcase,create,edit,view');
+
+    $lang->testsuite->menuOrder[5]  = 'product';
+    $lang->testsuite->menuOrder[10] = 'testcase';
+    $lang->testsuite->menuOrder[15] = 'browse';
 
     /* Adjust sub menu of testtask. */
     $lang->testtask->menu = new stdclass();
     $lang->testtask->menu->product  = '%s';
     $lang->testtask->menu->browse   = array('link' => '浏览版本|testtask|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
     $lang->testtask->menu->create   = array('link' => '提交测试|testtask|create|productID=%s');
+    $lang->testtask->menu->report   = array('link' => '报告|testreport|browse');
 
     $lang->testtask->menuOrder[5]  = 'product';
     $lang->testtask->menuOrder[10] = 'browse';
     $lang->testtask->menuOrder[15] = 'create';
-
-    /* Adjust sub menu of bug module. */
-    $lang->testsuite->menu = new stdclass();
-    $lang->testsuite->menu->product = '%s';
-    $lang->testsuite->menu->browse  = array('link' => '浏览套件|testsuite|browse|productID=%s', 'alias' => 'linkcase,edit,view');
-    $lang->testsuite->menu->caselib = array('link' => '用例库|testsuite|library', 'alias' => 'createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
-
-    $lang->testsuite->menuOrder[5]  = 'product';
-    $lang->testsuite->menuOrder[10] = 'browse';
-    $lang->testsuite->menuOrder[15] = 'create';
+    $lang->testtask->menuOrder[20] = 'report';
 
     /* Adjust sub menu of caselib module. */
     $lang->caselib->menu = new stdclass();
     $lang->caselib->menu->lib       = array('link' => '%s', 'fixed' => true);
-    $lang->caselib->menu->testsuite = array('link' => '浏览套件|testsuite|browse|productID=%s', 'alias' => 'linkcase,edit,view');
     $lang->caselib->menu->caselib   = array('link' => '用例库|testsuite|library', 'alias' => 'createlib,createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
     $lang->caselib->menu->createlib = array('link' => "<i class='icon-plus'></i>创建库|testsuite|createLib|", 'float' => 'right');
 
     /* Adjust sub menu of report module. */
     $lang->testreport->menu = new stdclass();
     $lang->testreport->menu->product = '%s';
-    $lang->testreport->menu->browse  = array('link' => '浏览报告|testreport|browse|productID=%s', 'alias' => 'create,edit,view');
+    $lang->testreport->menu->browse  = array('link' => '浏览版本|testtask|browse|productID=%s', 'alias' => 'viewedit,resolve,close,activate,report', 'subModule' => 'tree');
+    $lang->testreport->menu->create  = array('link' => '提交测试|testtask|create|productID=%s');
+    $lang->testreport->menu->report  = array('link' => '报告|testreport|browse');
+
+    $lang->testreport->menuOrder[5]  = 'product';
+    $lang->testreport->menuOrder[10] = 'browse';
+    $lang->testreport->menuOrder[15] = 'create';
+    $lang->testreport->menuOrder[20] = 'report';
 
     /* Adjust sub menu of product module. */
     unset($lang->product->menu->story);
@@ -742,8 +747,8 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
     $lang->menugroup->bug        = 'bug';
     $lang->menugroup->testcase   = 'testcase';
     $lang->menugroup->testtask   = 'testtask';
-    $lang->menugroup->testsuite  = 'testsuite';
-    $lang->menugroup->testreport = 'testreport';
+    $lang->menugroup->testsuite  = 'caselib';
+    $lang->menugroup->testreport = 'testtask';
     $lang->menugroup->build      = 'product';
     
     /* Adjust search objects. */ 
diff --git a/module/testsuite/js/common.js b/module/testsuite/js/common.js
new file mode 100644
index 0000000000..b9480c5f28
--- /dev/null
+++ b/module/testsuite/js/common.js
@@ -0,0 +1,8 @@
+$(document).ready(function()
+{
+    if(onlyTest)
+    {
+        $('#mainmenu > .nav > li').removeClass('active');
+        $('#mainmenu > .nav > li[data-id=testcase]').addClass('active');
+    }
+})
diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php
index 05d53a8a7c..cb09e20e28 100644
--- a/module/testsuite/view/browse.html.php
+++ b/module/testsuite/view/browse.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('confirmDelete', $lang->testsuite->confirmDelete)?>
+<?php js::set('onlyTest', $config->global->flow == 'onlyTest')?>
 <div id="titlebar">
   <div class="heading"> <?php echo $lang->testsuite->browse?> </div>
   <div class="actions"><?php common::printIcon('testsuite', 'create', "product=$productID");?></div>
diff --git a/module/testsuite/view/create.html.php b/module/testsuite/view/create.html.php
index ec66c7e87f..08d631acf3 100644
--- a/module/testsuite/view/create.html.php
+++ b/module/testsuite/view/create.html.php
@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php js::set('onlyTest', $config->global->flow == 'onlyTest')?>
 <div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
diff --git a/module/testsuite/view/edit.html.php b/module/testsuite/view/edit.html.php
index b1aad7a4a7..08c5591865 100644
--- a/module/testsuite/view/edit.html.php
+++ b/module/testsuite/view/edit.html.php
@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php js::set('onlyTest', $config->global->flow == 'onlyTest')?>
 <div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php
index bb436ae6c0..b3b59ee416 100644
--- a/module/testsuite/view/linkcase.html.php
+++ b/module/testsuite/view/linkcase.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
+<?php js::set('onlyTest', $config->global->flow == 'onlyTest')?>
 <div id='titlebar'>
   <div class='heading'>
     <span class='prefix'> <strong><?php echo $suite->id;?></strong></span>
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index 9226aa8c13..160e15afd4 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmUnlink', $lang->testsuite->confirmUnlinkCase)?>
+<?php js::set('onlyTest', $config->global->flow == 'onlyTest')?>
 <div id='titlebar'>
   <div class='heading'>
     <span class='prefix' title='TESTSUITE'><strong><?php echo $suite->id;?></strong></span>