diff --git a/lld/test/ELF/Inputs/progname-ver.s b/lld/test/ELF/Inputs/progname-ver.s
new file mode 100644
index 000000000000..06fc294a0980
--- /dev/null
+++ b/lld/test/ELF/Inputs/progname-ver.s
@@ -0,0 +1,3 @@
+.global bar
+bar:
+.quad __progname@GOT
diff --git a/lld/test/ELF/Inputs/progname-ver.so b/lld/test/ELF/Inputs/progname-ver.so
deleted file mode 100755
index e6bb3228f6c6..000000000000
Binary files a/lld/test/ELF/Inputs/progname-ver.so and /dev/null differ
diff --git a/lld/test/ELF/progname.s b/lld/test/ELF/progname.s
index 10cbf177c69b..a8837da69b5c 100644
--- a/lld/test/ELF/progname.s
+++ b/lld/test/ELF/progname.s
@@ -1,31 +1,19 @@
-// RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: echo .global __progname > %t2.s
-// RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %t2.s -o %t2.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %t2.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld -o %t %t.o %t2.so
 // RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
 
-
-// Inputs/progname-ver.so consists of the assembly file
-//
-// .global bar
-// bar:
-// .quad __progname
-//
-// linked into a library  with the version script
-//
-// VER_1 {
-//  global:
-//  bar;
-// };
-//
-// We should create it with lld itself once we it supports that.
-
-// RUN: ld.lld -o %t %t.o %p/Inputs/progname-ver.so
+// RUN: echo "VER_1 { global: bar; };" > %s.script
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux \
+// RUN:   %p/Inputs/progname-ver.s -o %t-ver.o
+// RUN: ld.lld -shared -o %t.so -version-script %s.script %t-ver.o
+// RUN: ld.lld -o %t %t.o %t.so
 // RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
 
 // CHECK:      Name:     __progname@
-// CHECK-NEXT: Value:    0x11000
+// CHECK-NEXT: Value:    0x201000
 // CHECK-NEXT: Size:     0
 // CHECK-NEXT: Binding:  Global (0x1)
 // CHECK-NEXT: Type:     None (0x0)