diff --git a/redfish/systems/LogServices/test_post_codes.robot b/redfish/systems/LogServices/test_post_codes.robot
index 214dae8..2f4972a 100644
--- a/redfish/systems/LogServices/test_post_codes.robot
+++ b/redfish/systems/LogServices/test_post_codes.robot
@@ -11,7 +11,7 @@
 Test Teardown    Test Teardown Execution
 Suite Teardown   Suite Teardown Execution
 
-Force Tags       Post_Codes
+Test Tags       Post_Codes
 
 *** Variables ***
 ${max_view_count}    1000
diff --git a/redfish/systems/eventlog/test_esel.robot b/redfish/systems/eventlog/test_esel.robot
index d1947e3..7534520 100644
--- a/redfish/systems/eventlog/test_esel.robot
+++ b/redfish/systems/eventlog/test_esel.robot
@@ -15,7 +15,7 @@
 Test Setup          Test Setup Execution
 Test Teardown       FFDC On Test Case Fail
 
-Force Tags          eSEL
+Test Tags          eSEL
 
 *** Variables ***
 
diff --git a/redfish/systems/eventlog/test_event_association.robot b/redfish/systems/eventlog/test_event_association.robot
index e98f55f..cfdfd66 100755
--- a/redfish/systems/eventlog/test_event_association.robot
+++ b/redfish/systems/eventlog/test_event_association.robot
@@ -15,7 +15,7 @@
 Test Setup          Test Setup Execution
 Test Teardown       FFDC On Test Case Fail
 
-Force Tags          Event_Association
+Test Tags          Event_Association
 
 ***Variables***
 ${target_device_path}  /sys/devices/platform/gpio-fsi/fsi0/slave@00:00/raw
diff --git a/redfish/systems/eventlog/test_event_logging.robot b/redfish/systems/eventlog/test_event_logging.robot
index 8aa676b..4853151 100644
--- a/redfish/systems/eventlog/test_event_logging.robot
+++ b/redfish/systems/eventlog/test_event_logging.robot
@@ -13,7 +13,7 @@
 Test Setup          Test Setup Execution
 Test Teardown       Test Teardown Execution
 
-Force Tags          Event_Logging
+Test Tags          Event_Logging
 
 ** Variables ***
 
diff --git a/redfish/systems/eventlog/test_event_service.robot b/redfish/systems/eventlog/test_event_service.robot
index 77bb6ad..d22cbd4 100644
--- a/redfish/systems/eventlog/test_event_service.robot
+++ b/redfish/systems/eventlog/test_event_service.robot
@@ -12,7 +12,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
-Force Tags       Event_Service
+Test Tags       Event_Service
 
 ***Variables***
 
diff --git a/redfish/systems/test_boot_devices.robot b/redfish/systems/test_boot_devices.robot
index e567027..de636b6 100644
--- a/redfish/systems/test_boot_devices.robot
+++ b/redfish/systems/test_boot_devices.robot
@@ -10,7 +10,7 @@
 Test Teardown    Test Teardown Execution
 Suite Teardown   Suite Teardown Execution
 
-Force Tags       Boot_Devices
+Test Tags       Boot_Devices
 
 *** Variables ***
 # Maps for correlating redfish data values to IPMI data values.