diff --git a/tests/macros.efi-srpm_test.sh b/tests/macros.efi-srpm_test.sh
old mode 100644
new mode 100755
index 7875cea..442e3ff
--- a/tests/macros.efi-srpm_test.sh
+++ b/tests/macros.efi-srpm_test.sh
@@ -3,6 +3,8 @@
 # exit when any command fails
 set -e
 
+os_name=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/' -e 's/\"//g')
+
 declare -A archs
 archs[ia64]="efi_alt_arch=none
 	efi_alt_arch_upper=NONE
@@ -10,11 +12,11 @@ archs[ia64]="efi_alt_arch=none
 	efi_arch_upper=IA64
 	efi_has_alt_arch=00
 	efi_has_arch=01"
-archs[x86_64]="efi_alt_arch=ia32
-	efi_alt_arch_upper=IA32
+archs[x86_64]="efi_alt_arch=none
+	efi_alt_arch_upper=NONE
 	efi_arch=x64
 	efi_arch_upper=X64
-	efi_has_alt_arch=01
+	efi_has_alt_arch=00
 	efi_has_arch=01"
 archs["%{ix86}"]="efi_alt_arch=none
 	efi_alt_arch_upper=NONE
@@ -36,10 +38,10 @@ archs["%{arm}"]="efi_alt_arch=none
 	efi_has_arch=01"
 
 common="efi_esp_boot=/boot/efi/EFI/BOOT
-	efi_esp_dir=/boot/efi/EFI/redhat
+	efi_esp_dir=/boot/efi/EFI/$os_name
 	efi_esp_efi=/boot/efi/EFI
 	efi_esp_root=/boot/efi
-	efi_vendor=redhat"
+	efi_vendor=$os_name"
 
 output=$(mktemp)