diff --git a/01-TestCase/tsg_cli/EnDisablePolicy.robot b/01-TestCase/tsg_cli/EnDisablePolicy.robot
index 64569ba..2da132a 100644
--- a/01-TestCase/tsg_cli/EnDisablePolicy.robot
+++ b/01-TestCase/tsg_cli/EnDisablePolicy.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Force Tags      tsg-cli    Policy    EnDisable    
+Force Tags      tsg_cli    tsg_device    EnDisable    
 Resource        ../../03-Variable/BifangApiVariable.txt
 Resource        ../../02-Keyword/tsg_cli/Interface.robot
 
diff --git a/01-TestCase/tsg_cli/ImExportObject.robot b/01-TestCase/tsg_cli/ImExportObject.robot
index 71f1669..5dc16d9 100644
--- a/01-TestCase/tsg_cli/ImExportObject.robot
+++ b/01-TestCase/tsg_cli/ImExportObject.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Test Teardown    Clear_Test_Data    
-Force Tags      tsg-cli    Object    ExImport
+Force Tags      tsg_cli    tsg_device    ExImport
 Resource        ../../03-Variable/BifangApiVariable.txt
 Resource        ../../02-Keyword/tsg_cli/Interface.robot
 
diff --git a/01-TestCase/tsg_cli/OtherCommand.robot b/01-TestCase/tsg_cli/OtherCommand.robot
index 48aec02..556272c 100644
--- a/01-TestCase/tsg_cli/OtherCommand.robot
+++ b/01-TestCase/tsg_cli/OtherCommand.robot
@@ -1,10 +1,11 @@
 *** Settings ***
+Force Tags      tsg_cli    tsg_device    OtherCommand
 Resource        ../../03-Variable/BifangApiVariable.txt
 Resource        ../../02-Keyword/tsg_cli/Interface.robot
 
 *** Test Cases ***
 Tsg_Help_TestCase
-    [Tags]    tsg-cli    TsgHelp
+    [Tags]    tsg_cli    TsgHelp
     Tsg_Help_Keyword
     Tsg_Command_Help    tsg_policy    
     Tsg_Command_Help    tsg_policy_object    
diff --git a/01-TestCase/tsg_cli/QueryManipulationPolicy.robot b/01-TestCase/tsg_cli/QueryManipulationPolicy.robot
index a36710b..aa5fcc2 100644
--- a/01-TestCase/tsg_cli/QueryManipulationPolicy.robot
+++ b/01-TestCase/tsg_cli/QueryManipulationPolicy.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Force Tags      tsg-cli    ManipulationPolicy    Query
+Force Tags      tsg_cli    tsg_device	ManipulationPolicy    Query
 Resource        ../../03-Variable/BifangApiVariable.txt
 Resource        ../../02-Keyword/tsg_cli/Interface.robot
 
diff --git a/01-TestCase/tsg_cli/QueryObject.robot b/01-TestCase/tsg_cli/QueryObject.robot
index 2251469..fa57479 100644
--- a/01-TestCase/tsg_cli/QueryObject.robot
+++ b/01-TestCase/tsg_cli/QueryObject.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Force Tags      tsg-cli    Object    Query
+Force Tags      tsg_cli    tsg_device    Object    Query
 Resource        ../../03-Variable/BifangApiVariable.txt
 Resource        ../../02-Keyword/tsg_cli/Interface.robot
 
diff --git a/01-TestCase/tsg_cli/QuerySecurityPolicy.robot b/01-TestCase/tsg_cli/QuerySecurityPolicy.robot
index 3ff11dd..6a25993 100644
--- a/01-TestCase/tsg_cli/QuerySecurityPolicy.robot
+++ b/01-TestCase/tsg_cli/QuerySecurityPolicy.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Force Tags      tsg-cli    SecurityPolicy    Query
+Force Tags      tsg_cli    tsg_device    SecurityPolicy    Query
 Resource        ../../03-Variable/BifangApiVariable.txt
 Resource        ../../02-Keyword/tsg_cli/Interface.robot
 
diff --git a/01-TestCase/tsg_mib/MibTestCase.robot b/01-TestCase/tsg_mib/MibTestCase.robot
index 2fa06c0..7e1d060 100644
--- a/01-TestCase/tsg_mib/MibTestCase.robot
+++ b/01-TestCase/tsg_mib/MibTestCase.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Force Tags    tsg-mib    query
+Force Tags    tsg_mib    tsg_device    query
 Test Setup        OpenMibConnection
 Test Teardown     CloseMibConnection
 Library           json