diff --git a/redfish/systems/LogServices/test_post_codes.robot b/redfish/systems/LogServices/test_post_codes.robot
index 6585ec3..f6a859a 100644
--- a/redfish/systems/LogServices/test_post_codes.robot
+++ b/redfish/systems/LogServices/test_post_codes.robot
@@ -11,6 +11,7 @@
 Test Teardown    Test Teardown Execution
 Suite Teardown   Suite Teardown Execution
 
+Force 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 c1414d9..84d025d 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
+Force Tags          eSEL
 
 *** Variables ***
 
diff --git a/redfish/systems/eventlog/test_association.robot b/redfish/systems/eventlog/test_event_association.robot
similarity index 99%
rename from redfish/systems/eventlog/test_association.robot
rename to redfish/systems/eventlog/test_event_association.robot
index 093aff0..e98f55f 100755
--- a/redfish/systems/eventlog/test_association.robot
+++ b/redfish/systems/eventlog/test_event_association.robot
@@ -15,6 +15,8 @@
 Test Setup          Test Setup Execution
 Test Teardown       FFDC On Test Case Fail
 
+Force 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 4c4d162..6c4e22a 100644
--- a/redfish/systems/eventlog/test_event_logging.robot
+++ b/redfish/systems/eventlog/test_event_logging.robot
@@ -13,6 +13,8 @@
 Test Setup          Test Setup Execution
 Test Teardown       Test Teardown Execution
 
+Force Tags          Event_Logging
+
 ** Variables ***
 
 ${max_num_event_logs}  ${200}
diff --git a/redfish/systems/eventlog/test_event_service.robot b/redfish/systems/eventlog/test_event_service.robot
index e4a71a8..77bb6ad 100644
--- a/redfish/systems/eventlog/test_event_service.robot
+++ b/redfish/systems/eventlog/test_event_service.robot
@@ -12,6 +12,8 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
+Force Tags       Event_Service
+
 ***Variables***
 
 # override this default using -v REMOTE_SERVER_IP:<IP> from CLI
diff --git a/redfish/systems/test_boot_devices.robot b/redfish/systems/test_boot_devices.robot
index c43b309..574b330 100644
--- a/redfish/systems/test_boot_devices.robot
+++ b/redfish/systems/test_boot_devices.robot
@@ -10,6 +10,8 @@
 Test Teardown    Test Teardown Execution
 Suite Teardown   Suite Teardown Execution
 
+Force Tags       Boot_Devices
+
 *** Variables ***
 # Maps for correlating redfish data values to IPMI data values.
 # The redfish values are obtained with Redfish.Get or Redfish.Get Properties.