diff --git a/openpower/check_error_logs.robot b/openpower/pel/check_error_logs.robot
similarity index 88%
rename from openpower/check_error_logs.robot
rename to openpower/pel/check_error_logs.robot
index c1d3642..b76d4f5 100644
--- a/openpower/check_error_logs.robot
+++ b/openpower/pel/check_error_logs.robot
@@ -4,12 +4,14 @@
 # Test Parameters:
 # OPENBMC_HOST      The BMC host name or IP address.
 
-Resource            ../lib/bmc_redfish_resource.robot
-Resource            ../lib/openbmc_ffdc.robot
+Resource            ../../lib/bmc_redfish_resource.robot
+Resource            ../../lib/openbmc_ffdc.robot
 
 Suite Setup         Suite Setup Execution
 Test Setup          Printn
 
+Test Tags           Check_Error_Logs
+
 *** Variables ***
 ${QUIET}                       ${1}
 
diff --git a/openpower/check_vpd_and_hw_status.robot b/openpower/vpd/check_vpd_and_hw_status.robot
similarity index 90%
rename from openpower/check_vpd_and_hw_status.robot
rename to openpower/vpd/check_vpd_and_hw_status.robot
index 4eddcdd..3e0b480 100644
--- a/openpower/check_vpd_and_hw_status.robot
+++ b/openpower/vpd/check_vpd_and_hw_status.robot
@@ -4,12 +4,14 @@
 # Test Parameters:
 # OPENBMC_HOST      The BMC host name or IP address.
 
-Resource            ../lib/bmc_redfish_resource.robot
-Resource            ../lib/openbmc_ffdc.robot
+Resource            ../../lib/bmc_redfish_resource.robot
+Resource            ../../lib/openbmc_ffdc.robot
 
 Suite Setup         Suite Setup Execution
 Test Setup          Printn
 
+Test Tags           Check_VPD_And_HW_Status
+
 *** Variables ***
 ${QUIET}  ${1}