diff --git a/config/tests/guest/libvirt/migrate.cfg b/config/tests/guest/libvirt/migrate.cfg
index 127d8e7..8d2f080 100644
--- a/config/tests/guest/libvirt/migrate.cfg
+++ b/config/tests/guest/libvirt/migrate.cfg
@@ -6,7 +6,7 @@ username = root
 password = 123456
 main_vm = avocado-vt-vm1
 vms = avocado-vt-vm1
-migrate_main_vm = "${main_vm}"
+migrate_main_vm = <_migrate_main_vm_>
 
 # Network
 nettype = bridge
@@ -56,19 +56,19 @@ nfs_mount_src=/home/migrate/NFS
 export_dir=/home/migrate/NFS
 
 # libvirt (host information for remote testcases)
-local_ip = "10.1.1.3"
-local_pwd = "password"
-remote_ip = "10.1.1.2"
-remote_user = root
+local_ip = <_local_ip_>
+local_pwd = <_local_pwd_>
+remote_ip = <_remote_ip_>
+remote_user = <_remote_user_>
 
 # Default password is same as local_pwd
-remote_pwd = "password"
+remote_pwd = <_remote_pwd_>
 
 # Migration source and destination machine details
-migrate_source_host = "${local_ip}"
-migrate_source_pwd = "${local_pwd}"
-migrate_dest_host = "${remote_ip}"
-migrate_dest_pwd = "${remote_pwd}"
+migrate_source_host = <_migrate_source_host_>
+migrate_source_pwd = <_migrate_source_pwd_>
+migrate_dest_host = <_migrate_dest_host_>
+migrate_dest_pwd = <_migrate_dest_pwd_>
 
 # This param required for testcases with hugepages
 hugepage_force_allocate = "yes"
diff --git a/config/tests/guest/libvirt/migrate_p1.cfg b/config/tests/guest/libvirt/migrate_p1.cfg
index 9652229..4023964 100644
--- a/config/tests/guest/libvirt/migrate_p1.cfg
+++ b/config/tests/guest/libvirt/migrate_p1.cfg
@@ -6,7 +6,7 @@ username = root
 password = 123456
 main_vm = avocado-vt-vm1
 vms = avocado-vt-vm1
-migrate_main_vm = "${main_vm}"
+migrate_main_vm = <_migrate_main_vm_>
 
 # Network
 nettype = bridge
@@ -56,19 +56,19 @@ nfs_mount_src=/home/migrate/NFS
 export_dir=/home/migrate/NFS
 
 # libvirt (host information for remote testcases)
-local_ip = "10.48.36.118"
-local_pwd = "Aform@fvt"
-remote_ip = "10.48.36.121"
-remote_user = root
+local_ip = <_local_ip_>
+local_pwd = <_local_pwd_>
+remote_ip = <_remote_ip_>
+remote_user = <_remote_user_>
 
 # Default password is same as local_pwd
-remote_pwd = "Aform@fvt"
+remote_pwd = <_remote_pwd_>
 
 # Migration source and destination machine details
-migrate_source_host = "${local_ip}"
-migrate_source_pwd = "${local_pwd}"
-migrate_dest_host = "${remote_ip}"
-migrate_dest_pwd = "${remote_pwd}"
+migrate_source_host = <_migrate_source_host_>
+migrate_source_pwd = <_migrate_source_pwd_>
+migrate_dest_host = <_migrate_dest_host_>
+migrate_dest_pwd = <_migrate_dest_pwd_>
 
 # This param required for testcases with hugepages
 hugepage_force_allocate = "yes"
diff --git a/config/tests/guest/libvirt/migrate_p2.cfg b/config/tests/guest/libvirt/migrate_p2.cfg
index 6914183..554367f 100644
--- a/config/tests/guest/libvirt/migrate_p2.cfg
+++ b/config/tests/guest/libvirt/migrate_p2.cfg
@@ -6,7 +6,7 @@ username = root
 password = 123456
 main_vm = avocado-vt-vm1
 vms = avocado-vt-vm1
-migrate_main_vm = "${main_vm}"
+migrate_main_vm = <_migrate_main_vm_>
 
 # Network
 nettype = bridge
@@ -56,19 +56,19 @@ nfs_mount_src=/home/migrate/NFS
 export_dir=/home/migrate/NFS
 
 # libvirt (host information for remote testcases)
-local_ip = "10.48.36.118"
-local_pwd = "Aform@fvt"
-remote_ip = "10.48.36.121"
-remote_user = root
+local_ip = <_local_ip_>
+local_pwd = <_local_pwd_>
+remote_ip = <_remote_ip_>
+remote_user = <_remote_user_>
 
 # Default password is same as local_pwd
-remote_pwd = "Aform@fvt"
+remote_pwd = <_remote_pwd_>
 
 # Migration source and destination machine details
-migrate_source_host = "${local_ip}"
-migrate_source_pwd = "${local_pwd}"
-migrate_dest_host = "${remote_ip}"
-migrate_dest_pwd = "${remote_pwd}"
+migrate_source_host = <_migrate_source_host_>
+migrate_source_pwd = <_migrate_source_pwd_>
+migrate_dest_host = <_migrate_dest_host_>
+migrate_dest_pwd = <_migrate_dest_pwd_>
 
 # This param required for testcases with hugepages
 hugepage_force_allocate = "yes"
diff --git a/config/tests/guest/libvirt/migrate_p3.cfg b/config/tests/guest/libvirt/migrate_p3.cfg
index 1ebde87..167d75a 100644
--- a/config/tests/guest/libvirt/migrate_p3.cfg
+++ b/config/tests/guest/libvirt/migrate_p3.cfg
@@ -6,7 +6,7 @@ username = root
 password = 123456
 main_vm = avocado-vt-vm1
 vms = avocado-vt-vm1
-migrate_main_vm = "${main_vm}"
+migrate_main_vm = <_migrate_main_vm_>
 
 # Network
 nettype = bridge
@@ -56,19 +56,19 @@ nfs_mount_src=/home/migrate/NFS
 export_dir=/home/migrate/NFS
 
 # libvirt (host information for remote testcases)
-local_ip = "10.48.36.118"
-local_pwd = "Aform@fvt"
-remote_ip = "10.48.36.121"
-remote_user = root
+local_ip = <_local_ip_>
+local_pwd = <_local_pwd_>
+remote_ip = <_remote_ip_>
+remote_user = <_remote_user_>
 
 # Default password is same as local_pwd
-remote_pwd = "Aform@fvt"
+remote_pwd = <_remote_pwd_>
 
 # Migration source and destination machine details
-migrate_source_host = "${local_ip}"
-migrate_source_pwd = "${local_pwd}"
-migrate_dest_host = "${remote_ip}"
-migrate_dest_pwd = "${remote_pwd}"
+migrate_source_host = <_migrate_source_host_>
+migrate_source_pwd = <_migrate_source_pwd_>
+migrate_dest_host = <_migrate_dest_host_>
+migrate_dest_pwd = <_migrate_dest_pwd_>
 
 # This param required for testcases with hugepages
 hugepage_force_allocate = "yes"
diff --git a/config/tests/guest/libvirt/pci_passthrough.cfg b/config/tests/guest/libvirt/pci_passthrough.cfg
index 27aa54d..e803498 100644
--- a/config/tests/guest/libvirt/pci_passthrough.cfg
+++ b/config/tests/guest/libvirt/pci_passthrough.cfg
@@ -38,21 +38,21 @@ vcpu_sockets = 1
 # 32G
 mem = 32768
 # number_vfs = 2
-number_vfs = "Enter the no.of Virtual Function's to be created for each PF"
+number_vfs = <_number_vfs_>
 # Eg: 0000:05:00.0
-pf_filter = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_net_ip = "ENTER.YOUR.IP"
-libvirt_pci_server_ip = "ENTER.YOUR.SERVER.IP"
-libvirt_pci_net_mask = "ENTER.YOUR.NETMASK"
+pf_filter = <_pf_filter_>
+libvirt_pci_net_ip = <_libvirt_pci_net_ip_>
+libvirt_pci_server_ip = <_libvirt_pci_server_ip_>
+libvirt_pci_net_mask = <_libvirt_pci_net_mask_>
 # Eg: 0000:05:00.0
-libvirt_pci_net_dev_name = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_storage_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_name = <_libvirt_pci_net_dev_name_>
+libvirt_pci_storage_dev_label = <_libvirt_pci_storage_dev_label_>
 # enter timeout value
-timeout = "ENTER.YOUR.TIMEOUT"
+timeout =<_timeout_>
 # model is dependent on architecture
 # for power architecture it is pci-root
 # index should be other than default VPHB i.e 0
-model = "ENTER.YOUR.DEVICE.MODEL"
+model = <_model_>
 # enter value for how many times hotplug/unplug will happen
 # except stress test remaining all tests it will be 1
 stress_val = "1"
@@ -61,14 +61,14 @@ stress_val = "1"
 # device to guest. Then this network device
 # will be unavailable on host.
 # E.g: 0000:05:00.0
-libvirt_pci_net_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_label = <_libvirt_pci_net_dev_label_>
 # enter the ioa system bus info
 # this value wil be based on the system bus info
 # if your system is 32-bit then use ioa-bus-error
 # if your system is 64-bit then use ioa-bus-error-64
-ioa_system_info = "ioa-bus-error"
+ioa_system_info = <_ioa_system_info_>
 # enter the functioninjection values your system supports 4 or 6 
-func = "6"
+func = <_func_>
 # enter the number of eeh hits you want to trigger
 # after this the device will be permanently disabled
 max_freeze = "5"
diff --git a/config/tests/guest/libvirt/pci_passthrough_p1.cfg b/config/tests/guest/libvirt/pci_passthrough_p1.cfg
index f5ed945..39c6ad3 100644
--- a/config/tests/guest/libvirt/pci_passthrough_p1.cfg
+++ b/config/tests/guest/libvirt/pci_passthrough_p1.cfg
@@ -38,21 +38,21 @@ vcpu_sockets = 1
 # 32G
 mem = 32768
 # number_vfs = 2
-number_vfs = "Enter the no.of Virtual Function's to be created for each PF"
+number_vfs = <_number_vfs_>
 # Eg: 0000:05:00.0
-pf_filter = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_net_ip = "ENTER.YOUR.IP"
-libvirt_pci_server_ip = "ENTER.YOUR.SERVER.IP"
-libvirt_pci_net_mask = "ENTER.YOUR.NETMASK"
+pf_filter = <_pf_filter_>
+libvirt_pci_net_ip = <_libvirt_pci_net_ip_>
+libvirt_pci_server_ip = <_libvirt_pci_server_ip_>
+libvirt_pci_net_mask = <_libvirt_pci_net_mask_>
 # Eg: 0000:05:00.0
-libvirt_pci_net_dev_name = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_storage_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_name = <_libvirt_pci_net_dev_name_>
+libvirt_pci_storage_dev_label = <_libvirt_pci_storage_dev_label_>
 # enter timeout value
-timeout = "ENTER.YOUR.TIMEOUT"
+timeout =<_timeout_>
 # model is dependent on architecture
 # for power architecture it is pci-root
 # index should be other than default VPHB i.e 0
-model = "ENTER.YOUR.DEVICE.MODEL"
+model = <_model_>
 # enter value for how many times hotplug/unplug will happen
 # except stress test remaining all tests it will be 1
 stress_val = "1"
@@ -61,14 +61,14 @@ stress_val = "1"
 # device to guest. Then this network device
 # will be unavailable on host.
 # E.g: 0000:05:00.0
-libvirt_pci_net_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_label = <_libvirt_pci_net_dev_label_>
 # enter the ioa system bus info
 # this value wil be based on the system bus info
 # if your system is 32-bit then use ioa-bus-error
 # if your system is 64-bit then use ioa-bus-error-64
-ioa_system_info = "ioa-bus-error"
-# enter the functioninjection values your system supports 4 or 6 
-func = "6"
+ioa_system_info = <_ioa_system_info_>
+# enter the functioninjection values your system supports 4 or 6
+func = <_func_>
 # enter the number of eeh hits you want to trigger
 # after this the device will be permanently disabled
 max_freeze = "5"
diff --git a/config/tests/guest/libvirt/pci_passthrough_p2.cfg b/config/tests/guest/libvirt/pci_passthrough_p2.cfg
index 4bb1024..bd260ab 100644
--- a/config/tests/guest/libvirt/pci_passthrough_p2.cfg
+++ b/config/tests/guest/libvirt/pci_passthrough_p2.cfg
@@ -38,21 +38,21 @@ vcpu_sockets = 1
 # 32G
 mem = 32768
 # number_vfs = 2
-number_vfs = "Enter the no.of Virtual Function's to be created for each PF"
+number_vfs = <_number_vfs_>
 # Eg: 0000:05:00.0
-pf_filter = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_net_ip = "ENTER.YOUR.IP"
-libvirt_pci_server_ip = "ENTER.YOUR.SERVER.IP"
-libvirt_pci_net_mask = "ENTER.YOUR.NETMASK"
+pf_filter = <_pf_filter_>
+libvirt_pci_net_ip = <_libvirt_pci_net_ip_>
+libvirt_pci_server_ip = <_libvirt_pci_server_ip_>
+libvirt_pci_net_mask = <_libvirt_pci_net_mask_>
 # Eg: 0000:05:00.0
-libvirt_pci_net_dev_name = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_storage_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_name = <_libvirt_pci_net_dev_name_>
+libvirt_pci_storage_dev_label = <_libvirt_pci_storage_dev_label_>
 # enter timeout value
-timeout = "ENTER.YOUR.TIMEOUT"
+timeout =<_timeout_>
 # model is dependent on architecture
 # for power architecture it is pci-root
 # index should be other than default VPHB i.e 0
-model = "ENTER.YOUR.DEVICE.MODEL"
+model = <_model_>
 # enter value for how many times hotplug/unplug will happen
 # except stress test remaining all tests it will be 1
 stress_val = "1"
@@ -61,14 +61,14 @@ stress_val = "1"
 # device to guest. Then this network device
 # will be unavailable on host.
 # E.g: 0000:05:00.0
-libvirt_pci_net_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_label = <_libvirt_pci_net_dev_label_>
 # enter the ioa system bus info
 # this value wil be based on the system bus info
 # if your system is 32-bit then use ioa-bus-error
 # if your system is 64-bit then use ioa-bus-error-64
-ioa_system_info = "ioa-bus-error"
-# enter the functioninjection values your system supports 4 or 6 
-func = "6"
+ioa_system_info = <_ioa_system_info_>
+# enter the functioninjection values your system supports 4 or 6
+func = <_func_>
 # enter the number of eeh hits you want to trigger
 # after this the device will be permanently disabled
 max_freeze = "5"
diff --git a/config/tests/guest/libvirt/pci_passthrough_p3.cfg b/config/tests/guest/libvirt/pci_passthrough_p3.cfg
index d78fd33..210ba81 100644
--- a/config/tests/guest/libvirt/pci_passthrough_p3.cfg
+++ b/config/tests/guest/libvirt/pci_passthrough_p3.cfg
@@ -38,21 +38,21 @@ vcpu_sockets = 1
 # 32G
 mem = 32768
 # number_vfs = 2
-number_vfs = "Enter the no.of Virtual Function's to be created for each PF"
+number_vfs = <_number_vfs_>
 # Eg: 0000:05:00.0
-pf_filter = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_net_ip = "ENTER.YOUR.IP"
-libvirt_pci_server_ip = "ENTER.YOUR.SERVER.IP"
-libvirt_pci_net_mask = "ENTER.YOUR.NETMASK"
+pf_filter = <_pf_filter_>
+libvirt_pci_net_ip = <_libvirt_pci_net_ip_>
+libvirt_pci_server_ip = <_libvirt_pci_server_ip_>
+libvirt_pci_net_mask = <_libvirt_pci_net_mask_>
 # Eg: 0000:05:00.0
-libvirt_pci_net_dev_name = "ENTER.YOUR.PCI.LABEL"
-libvirt_pci_storage_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_name = <_libvirt_pci_net_dev_name_>
+libvirt_pci_storage_dev_label = <_libvirt_pci_storage_dev_label_>
 # enter timeout value
-timeout = "ENTER.YOUR.TIMEOUT"
+timeout =<_timeout_>
 # model is dependent on architecture
 # for power architecture it is pci-root
 # index should be other than default VPHB i.e 0
-model = "ENTER.YOUR.DEVICE.MODEL"
+model = <_model_>
 # enter value for how many times hotplug/unplug will happen
 # except stress test remaining all tests it will be 1
 stress_val = "1"
@@ -61,14 +61,14 @@ stress_val = "1"
 # device to guest. Then this network device
 # will be unavailable on host.
 # E.g: 0000:05:00.0
-libvirt_pci_net_dev_label = "ENTER.YOUR.PCI.LABEL"
+libvirt_pci_net_dev_label = <_libvirt_pci_net_dev_label_>
 # enter the ioa system bus info
 # this value wil be based on the system bus info
 # if your system is 32-bit then use ioa-bus-error
 # if your system is 64-bit then use ioa-bus-error-64
-ioa_system_info = "ioa-bus-error"
-# enter the functioninjection values your system supports 4 or 6 
-func = "6"
+ioa_system_info = <_ioa_system_info_>
+# enter the functioninjection values your system supports 4 or 6
+func = <_func_>
 # enter the number of eeh hits you want to trigger
 # after this the device will be permanently disabled
 max_freeze = "5"