diff --git a/llvm/test/CodeGen/AArch64/fno-plt.c b/llvm/test/CodeGen/AArch64/fno-plt.c
index 81ed912ce927e1b3dd3e2071e53efca78b84dc58..6cc59b683da20aa2af1191f598780c213fe22765 100644
--- a/llvm/test/CodeGen/AArch64/fno-plt.c
+++ b/llvm/test/CodeGen/AArch64/fno-plt.c
@@ -1,8 +1,8 @@
-// RUN: clang %s -shared -fno-plt  -O2 -fno-inline  -fPIC   -o noplt.so
+// RUN: clang %s -shared -fno-plt -O2 -fno-inline -fPIC --target=aarch64-linux-gnu -fuse-ld=lld -nostdlib -o noplt.so
 // RUN: llvm-objdump -d noplt.so | FileCheck %s --check-prefix=CHECK-NO-PLT
 
-// RUN: clang %s -shared  -O2 -fno-inline  -fPIC   -o plt.so
-// RUN: llvm-objdump -d plt.so | FileCheck %s --check-prefix=CHECK-PLT
+// RUN: clang %s -shared          -O2 -fno-inline -fPIC --target=aarch64-linux-gnu -fuse-ld=lld -nostdlib -o plt.so
+// RUN: llvm-objdump -d plt.so   | FileCheck %s --check-prefix=CHECK-PLT
 
 // CHECK-PLT: bar@plt
 // CHECK-PLT: bar1@plt
diff --git a/llvm/test/CodeGen/AArch64/fno-plt.cpp b/llvm/test/CodeGen/AArch64/fno-plt.cpp
deleted file mode 100644
index c5a1f2f24b376fc59f4fd4197c7f085a1b7ce867..0000000000000000000000000000000000000000
--- a/llvm/test/CodeGen/AArch64/fno-plt.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// RUN: clang -x c++ %s -shared -fno-plt  -O2 -fno-inline  -fPIC   -o noplt.so
-// RUN: llvm-objdump -d noplt.so | FileCheck %s --check-prefix=CHECK-NO-PLT
-
-// RUN: clang -x c++ %s -shared  -O0  -fPIC   -o plt.so
-// RUN: llvm-objdump -d plt.so | FileCheck %s --check-prefix=CHECK-PLT
-
-// RUN: clang -x c++ %s -shared  -O2 -fno-inline  -fPIC   -o plt.so
-// RUN: llvm-objdump -d plt.so | FileCheck %s --check-prefix=CHECK-PLT
-
-// CHECK-PLT: bar@plt
-// CHECK-PLT: bar1@plt
-// CHECK-NO-PLT-NOT: bar@plt
-// CHECK-NO-PLT-NOT: bar1@plt
-// CHECK-NO-PLT-NOT: bar2@plt
-
-__attribute__((optnone))
-void bar(int a) {
-    return;
-}
-
-__attribute__((optnone))
-extern void bar1(int);
-
-__attribute__((optnone))
-static void bar2(int a) {
-    return;
-}
-
-void foo(int a) {
-    bar(a);
-    bar1(a);
-    bar2(a);
-    return;
-}
-