diff --git a/test cases/nasm/1 configure file/hello.asm b/test cases/nasm/1 configure file/hello-x86.asm
similarity index 100%
rename from test cases/nasm/1 configure file/hello.asm
rename to test cases/nasm/1 configure file/hello-x86.asm
diff --git a/test cases/nasm/1 configure file/hello-x86_64.asm b/test cases/nasm/1 configure file/hello-x86_64.asm
new file mode 100644
index 000000000000..b6cb776babbd
--- /dev/null
+++ b/test cases/nasm/1 configure file/hello-x86_64.asm	
@@ -0,0 +1,18 @@
+%include "config.asm"
+
+    section .data
+msg:    db "Hello World", 10
+len:    equ $ - msg
+
+    section .text
+    global main
+main:
+    mov eax, 1        ; sys_write
+    mov edi, 1        ; fd = STDOUT_FILENO
+    mov rsi, msg      ; buf = msg
+    mov rdx, len      ; count = len
+    syscall
+
+    mov eax, 60       ; sys_exit
+    mov edi, HELLO    ; exit code
+    syscall
diff --git a/test cases/nasm/1 configure file/meson.build b/test cases/nasm/1 configure file/meson.build
index abe7bb30f98c..46a704ceb633 100644
--- a/test cases/nasm/1 configure file/meson.build	
+++ b/test cases/nasm/1 configure file/meson.build	
@@ -50,7 +50,7 @@ config_file = configure_file(
 cc = meson.get_compiler('c')
 link_args = cc.get_supported_link_arguments(['-no-pie'])
 
-exe = executable('hello', asm_gen.process('hello.asm'),
+exe = executable('hello', asm_gen.process('hello-' + host_machine.cpu_family() + '.asm'),
   link_args: link_args,
 )
 
diff --git a/test cases/nasm/2 asm language/hello.asm b/test cases/nasm/2 asm language/hello-x86.asm
similarity index 100%
rename from test cases/nasm/2 asm language/hello.asm
rename to test cases/nasm/2 asm language/hello-x86.asm
diff --git a/test cases/nasm/2 asm language/hello-x86_64.asm b/test cases/nasm/2 asm language/hello-x86_64.asm
new file mode 100644
index 000000000000..7e495f92ab5e
--- /dev/null
+++ b/test cases/nasm/2 asm language/hello-x86_64.asm	
@@ -0,0 +1,22 @@
+%include "config.asm"
+
+%ifdef FOO
+%define RETVAL HELLO
+%endif
+
+    section .data
+msg:    db "Hello World", 10
+len:    equ $ - msg
+
+    section .text
+    global main
+main:
+    mov eax, 1        ; sys_write
+    mov edi, 1        ; fd = STDOUT_FILENO
+    mov rsi, msg      ; buf = msg
+    mov rdx, len      ; count = len
+    syscall
+
+    mov eax, 60       ; sys_exit
+    mov edi, RETVAL   ; exit code
+    syscall
diff --git a/test cases/nasm/2 asm language/meson.build b/test cases/nasm/2 asm language/meson.build
index d5a2ba3eaeb2..594d12dc2496 100644
--- a/test cases/nasm/2 asm language/meson.build	
+++ b/test cases/nasm/2 asm language/meson.build	
@@ -46,7 +46,7 @@ config_file = configure_file(
 cc = meson.get_compiler('c')
 link_args = cc.get_supported_link_arguments(['-no-pie'])
 
-exe = executable('hello', 'hello.asm',
+exe = executable('hello', 'hello-' + host_machine.cpu_family() + '.asm',
   nasm_args: '-DFOO',
   link_args: link_args,
 )
@@ -55,7 +55,7 @@ test('hello', exe)
 #Test whether pthread dependency gets filtered out
 threads = dependency('threads')
 
-exe2 = executable('hello_w_threads', 'hello.asm',
+exe2 = executable('hello_w_threads', 'hello-' + host_machine.cpu_family() + '.asm',
   config_file,
   nasm_args: '-DFOO',
   link_args: link_args,