diff --git a/systest/gpu_stress_test.robot b/systest/gpu_stress_test.robot
index ab6d84f..697afcd 100755
--- a/systest/gpu_stress_test.robot
+++ b/systest/gpu_stress_test.robot
@@ -24,7 +24,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
-Force Tags       GPU_Stress
+Test Tags       GPU_Stress
 
 *** Variables ****
 
diff --git a/systest/htx_hardbootme_test.robot b/systest/htx_hardbootme_test.robot
index 953441b..9e7ce18 100755
--- a/systest/htx_hardbootme_test.robot
+++ b/systest/htx_hardbootme_test.robot
@@ -51,7 +51,7 @@
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
-Force Tags      HTX_Hardbootme
+Test Tags      HTX_Hardbootme
 
 *** Variables ****
 
diff --git a/systest/htx_softbootme_test.robot b/systest/htx_softbootme_test.robot
index a354057..a022976 100644
--- a/systest/htx_softbootme_test.robot
+++ b/systest/htx_softbootme_test.robot
@@ -22,7 +22,7 @@
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
-Force Tags      HTX_Softbootme
+Test Tags      HTX_Softbootme
 
 *** Variables ****
 
diff --git a/systest/network_stability_test.robot b/systest/network_stability_test.robot
index 6f52ff0..af2daca 100755
--- a/systest/network_stability_test.robot
+++ b/systest/network_stability_test.robot
@@ -8,7 +8,7 @@
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
-Force Tags      Network_Stability
+Test Tags      Network_Stability
 
 *** Variables ****
 
diff --git a/systest/proc_freq_check.robot b/systest/proc_freq_check.robot
index 9c93a8b..ce1ac97 100755
--- a/systest/proc_freq_check.robot
+++ b/systest/proc_freq_check.robot
@@ -14,7 +14,7 @@
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 
-Force Tags       Proc_Freq_Check
+Test Tags       Proc_Freq_Check
 
 *** Test Cases ***
 
diff --git a/systest/test_bmc_poll_errors.robot b/systest/test_bmc_poll_errors.robot
index edf26af..b904518 100755
--- a/systest/test_bmc_poll_errors.robot
+++ b/systest/test_bmc_poll_errors.robot
@@ -12,7 +12,7 @@
 Suite Setup       Suite Setup Execution
 Test Teardown     Post Test Case Execution
 
-Force Tags        BMC_Poll_Errors
+Test Tags        BMC_Poll_Errors
 
 *** Variables ***
 
diff --git a/systest/test_boot_acceptance.robot b/systest/test_boot_acceptance.robot
index e4659c8..9fb76ce 100644
--- a/systest/test_boot_acceptance.robot
+++ b/systest/test_boot_acceptance.robot
@@ -49,7 +49,7 @@
 Suite Teardown  Collect HTX Log Files
 Test Teardown   FFDC On Test Case Fail
 
-Force Tags      Boot_Acceptance
+Test Tags      Boot_Acceptance
 
 *** Variables ***