diff --git a/redfish/dmtf_tools/test_redfishtool_certificate.robot b/redfish/dmtf_tools/test_redfishtool_certificate.robot
index 3437a3e..bd59cf4 100644
--- a/redfish/dmtf_tools/test_redfishtool_certificate.robot
+++ b/redfish/dmtf_tools/test_redfishtool_certificate.robot
@@ -16,7 +16,7 @@
 
 Suite Setup       Suite Setup Execution
 
-Force Tags        Redfishtool_Certificate
+Test Tags        Redfishtool_Certificate
 
 *** Variables ***
 
diff --git a/redfish/dmtf_tools/test_redfishtool_general.robot b/redfish/dmtf_tools/test_redfishtool_general.robot
index 5d0dbe9..57fa693 100644
--- a/redfish/dmtf_tools/test_redfishtool_general.robot
+++ b/redfish/dmtf_tools/test_redfishtool_general.robot
@@ -15,7 +15,7 @@
 
 Suite Setup       Suite Setup Execution
 
-Force Tags        Redfishtool_General
+Test Tags        Redfishtool_General
 
 *** Variables ***
 
diff --git a/redfish/dmtf_tools/test_redfishtool_local_user.robot b/redfish/dmtf_tools/test_redfishtool_local_user.robot
index 6e380cd..e00e4d3 100644
--- a/redfish/dmtf_tools/test_redfishtool_local_user.robot
+++ b/redfish/dmtf_tools/test_redfishtool_local_user.robot
@@ -15,7 +15,7 @@
 
 Suite Setup       Suite Setup Execution
 
-Force Tags        Redfishtool_Local_User
+Test Tags        Redfishtool_Local_User
 
 *** Variables ***