diff --git a/extended/code_update/bmc_code_update.robot b/extended/code_update/bmc_code_update.robot
index dbd3ef8..b096fd2 100644
--- a/extended/code_update/bmc_code_update.robot
+++ b/extended/code_update/bmc_code_update.robot
@@ -22,7 +22,7 @@
 # Force the test to timedout to prevent test hanging.
 Test Timeout      30 minutes
 
-Force Tags        BMC_Code_Update
+Test Tags        BMC_Code_Update
 
 *** Variables ***
 
diff --git a/extended/code_update/host_code_update.robot b/extended/code_update/host_code_update.robot
index 728a80f..229aa76 100644
--- a/extended/code_update/host_code_update.robot
+++ b/extended/code_update/host_code_update.robot
@@ -29,7 +29,7 @@
 
 Test Teardown     Code Update Test Teardown
 
-Force Tags        Host_Code_Update
+Test Tags        Host_Code_Update
 
 *** Variables ***
 
diff --git a/extended/factory_reset.robot b/extended/factory_reset.robot
index f221256..43e693f 100644
--- a/extended/factory_reset.robot
+++ b/extended/factory_reset.robot
@@ -10,7 +10,7 @@
 Suite Setup      Validate Setup
 Suite Teardown   Close All Connections
 
-Force Tags  Factory_Reset
+Test Tags  Factory_Reset
 
 *** Test Cases ***
 
diff --git a/extended/run_keyword.robot b/extended/run_keyword.robot
index 31253c7..c5caf45 100644
--- a/extended/run_keyword.robot
+++ b/extended/run_keyword.robot
@@ -32,7 +32,7 @@
 # NOTE: Robot searches PYTHONPATH for libraries.
 Library   run_keyword.py
 
-Force Tags  Run_Keyword_Pgm
+Test Tags  Run_Keyword_Pgm
 
 *** Variables ***
 # Initialize program parameters variables.
diff --git a/extended/test_ac_cycles.robot b/extended/test_ac_cycles.robot
index 8b02797..84d8f8c 100644
--- a/extended/test_ac_cycles.robot
+++ b/extended/test_ac_cycles.robot
@@ -11,7 +11,7 @@
 Suite Teardown    Close All Connections
 Test Teardown     FFDC On Test Case Fail
 
-Force Tags  AC_Cycles
+Test Tags  AC_Cycles
 
 *** Test Cases ***
 
diff --git a/extended/test_bios_update.robot b/extended/test_bios_update.robot
index 607b6c6..7649f6e 100644
--- a/extended/test_bios_update.robot
+++ b/extended/test_bios_update.robot
@@ -12,7 +12,7 @@
 
 Test Teardown           Test Teardown Execution
 
-Force Tags  BIOS_Code_Update
+Test Tags  BIOS_Code_Update
 
 *** Variables ***