diff --git a/flang/test/Driver/link-c-main.c b/flang/test/Driver/link-c-main-aarch64.c
rename from flang/test/Driver/link-c-main.c
rename to flang/test/Driver/link-c-main-aarch64.c
--- a/flang/test/Driver/link-c-main.c
+++ b/flang/test/Driver/link-c-main-aarch64.c
@@ -4,17 +4,16 @@
 
 For now, this test only covers the Gnu toolchain on Linux.
 
-REQUIRES: x86-registered-target || aarch64-registered-target || riscv64-registered-target
-REQUIRES: system-linux, c-compiler
+REQUIRES: aarch64-registered-target, system-linux, c-compiler
 
 RUN: %cc -c %s -o %t.o
-RUN: %flang -target x86_64-unknown-linux-gnu %t.o -o %t.out -flang-experimental-exec
+RUN: %flang -target aarch64-unknown-linux-gnu %t.o -o %t.out -flang-experimental-exec
 RUN: llvm-objdump --syms %t.out | FileCheck %s --implicit-check-not Fortran
 
 Test that it also works if the c-main is bundled in an archive.
 
 RUN: llvm-ar -r %t.a %t.o
-RUN: %flang -target x86_64-unknown-linux-gnu %t.a -o %ta.out -flang-experimental-exec
+RUN: %flang -target aarch64-unknown-linux-gnu %t.a -o %ta.out -flang-experimental-exec
 RUN: llvm-objdump --syms %ta.out | FileCheck %s --implicit-check-not Fortran
 */
 
diff --git a/flang/test/Driver/link-c-main.c b/flang/test/Driver/link-c-main-x86.c
rename from flang/test/Driver/link-c-main.c
rename to flang/test/Driver/link-c-main-x86.c
--- a/flang/test/Driver/link-c-main.c
+++ b/flang/test/Driver/link-c-main-x86.c
@@ -4,8 +4,7 @@
 
 For now, this test only covers the Gnu toolchain on Linux.
 
-REQUIRES: x86-registered-target || aarch64-registered-target || riscv64-registered-target
-REQUIRES: system-linux, c-compiler
+REQUIRES: x86-registered-target, system-linux, c-compiler
 
 RUN: %cc -c %s -o %t.o
 RUN: %flang -target x86_64-unknown-linux-gnu %t.o -o %t.out -flang-experimental-exec
diff --git a/flang/test/Driver/link-f90-main.f90 b/flang/test/Driver/link-f90-main-aarch64.f90
rename from flang/test/Driver/link-f90-main.f90
rename to flang/test/Driver/link-f90-main-aarch64.f90
--- a/flang/test/Driver/link-f90-main.f90
+++ b/flang/test/Driver/link-f90-main-aarch64.f90
@@ -3,17 +3,16 @@
 !
 ! For now, this test only covers the Gnu toolchain on linux.
 
-!REQUIRES: x86-registered-target || aarch64-registered-target || riscv64-registered-target
-!REQUIRES: system-linux
+!REQUIRES: aarch64-registered-target, system-linux
 
 ! RUN: %flang_fc1 -emit-obj %s -o %t.o
-! RUN: %flang -target x86_64-unknown-linux-gnu %t.o -o %t.out -flang-experimental-exec
+! RUN: %flang -target aarch64-unknown-linux-gnu %t.o -o %t.out -flang-experimental-exec
 ! RUN: llvm-objdump --syms %t.out | FileCheck %s
 
 ! Test that it also works if the program is bundled in an archive.
 
 ! RUN: llvm-ar -r %t.a %t.o
-! RUN: %flang -target x86_64-unknown-linux-gnu %t.a -o %ta.out -flang-experimental-exec
+! RUN: %flang -target aarch64-unknown-linux-gnu %t.a -o %ta.out -flang-experimental-exec
 ! RUN: llvm-objdump --syms %ta.out | FileCheck %s
 
 end program
diff --git a/flang/test/Driver/link-f90-main.f90 b/flang/test/Driver/link-f90-main-x86.f90
rename from flang/test/Driver/link-f90-main.f90
rename to flang/test/Driver/link-f90-main-x86.f90
--- a/flang/test/Driver/link-f90-main.f90
+++ b/flang/test/Driver/link-f90-main-x86.f90
@@ -3,8 +3,7 @@
 !
 ! For now, this test only covers the Gnu toolchain on linux.
 
-!REQUIRES: x86-registered-target || aarch64-registered-target || riscv64-registered-target
-!REQUIRES: system-linux
+!REQUIRES: x86-registered-target, system-linux
 
 ! RUN: %flang_fc1 -emit-obj %s -o %t.o
 ! RUN: %flang -target x86_64-unknown-linux-gnu %t.o -o %t.out -flang-experimental-exec