diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/commented_out.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/commented_out.fail.sh
index 2064d84c856..3c71a1bd5f7 100644
--- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/commented_out.fail.sh
+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/commented_out.fail.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # packages = audit
+# variables = var_auditd_name_format=hostname|fqd|numeric
 # Ensure test system has proper directories/files for test scenario
 bash -x setup.sh
 
diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/correct_value.pass.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/correct_value.pass.sh
index 20294dfb9a9..f9395dea53c 100644
--- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/correct_value.pass.sh
+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/correct_value.pass.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # packages = audit
+# variables = var_auditd_name_format=hostname|fqd|numeric
 # Ensure test system has proper directories/files for test scenario
 bash -x setup.sh
 
diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/correct_value_2.pass.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/correct_value_2.pass.sh
new file mode 100644
index 00000000000..e99e54aafa8
--- /dev/null
+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/correct_value_2.pass.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# packages = audit
+# variables = var_auditd_name_format=hostname|fqd|numeric
+# Ensure test system has proper directories/files for test scenario
+bash -x setup.sh
+
+{{%- if product in ["rhel7", "ol7"] %}}
+config_file="/etc/audisp/audispd.conf"
+{{%- else %}}
+config_file="/etc/audit/auditd.conf"
+{{%- endif %}}
+
+# remove any occurrence
+sed -i "s/^.*name_format.*$//" $config_file
+echo "name_format = fqd" >> $config_file
diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/empty.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/empty.fail.sh
index 73d1b9bc9d9..1d20fbc61de 100644
--- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/empty.fail.sh
+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/empty.fail.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # packages = audit
+# variables = var_auditd_name_format=hostname|fqd|numeric
 # Ensure test system has proper directories/files for test scenario
 
 bash -x setup.sh
diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/file_not_present.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/file_not_present.fail.sh
index 16299fe3f89..5ba3354018b 100644
--- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/file_not_present.fail.sh
+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/file_not_present.fail.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # packages = audit
+# variables = var_auditd_name_format=hostname|fqd|numeric
 
 {{%- if product in ["rhel7", "ol7"] %}}
 config_file="/etc/audisp/audispd.conf"
diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/not_present.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/not_present.fail.sh
index 50e6a53cbc8..8fe6b21970f 100644
--- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/not_present.fail.sh
+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/not_present.fail.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # packages = audit
+# variables = var_auditd_name_format=hostname|fqd|numeric
 # Ensure test system has proper directories/files for test scenario
 bash -x setup.sh
 
diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/wrong_value.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/wrong_value.fail.sh
new file mode 100644
index 00000000000..c137aa93409
--- /dev/null
+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/tests/wrong_value.fail.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# packages = audit
+# variables = var_auditd_name_format=hostname|fqd|numeric
+# Ensure test system has proper directories/files for test scenario
+bash -x setup.sh
+
+{{%- if product in ["rhel7", "ol7"] %}}
+config_file="/etc/audisp/audispd.conf"
+{{%- else %}}
+config_file="/etc/audit/auditd.conf"
+{{%- endif %}}
+
+# remove any occurrence
+sed -i "s/^.*name_format.*$//" $config_file
+echo "name_format = none" >> $config_file