diff --git a/ld/testsuite/ld-elfvsb/common.c b/ld/testsuite/ld-vsb/common.c
similarity index 100%
rename from ld/testsuite/ld-elfvsb/common.c
rename to ld/testsuite/ld-vsb/common.c
diff --git a/ld/testsuite/ld-elfvsb/define.s b/ld/testsuite/ld-vsb/define.s
similarity index 100%
rename from ld/testsuite/ld-elfvsb/define.s
rename to ld/testsuite/ld-vsb/define.s
diff --git a/ld/testsuite/ld-elfvsb/elf-offset.ld b/ld/testsuite/ld-vsb/elf-offset.ld
similarity index 100%
rename from ld/testsuite/ld-elfvsb/elf-offset.ld
rename to ld/testsuite/ld-vsb/elf-offset.ld
diff --git a/ld/testsuite/ld-elfvsb/elfvsb.dat b/ld/testsuite/ld-vsb/elfvsb.dat
similarity index 100%
rename from ld/testsuite/ld-elfvsb/elfvsb.dat
rename to ld/testsuite/ld-vsb/elfvsb.dat
diff --git a/ld/testsuite/ld-elfvsb/hidden0.d b/ld/testsuite/ld-vsb/hidden0-elf.d
similarity index 100%
rename from ld/testsuite/ld-elfvsb/hidden0.d
rename to ld/testsuite/ld-vsb/hidden0-elf.d
diff --git a/ld/testsuite/ld-elfvsb/hidden1.d b/ld/testsuite/ld-vsb/hidden1-elf.d
similarity index 100%
rename from ld/testsuite/ld-elfvsb/hidden1.d
rename to ld/testsuite/ld-vsb/hidden1-elf.d
diff --git a/ld/testsuite/ld-elfvsb/hidden2.d b/ld/testsuite/ld-vsb/hidden2-elf.d
similarity index 100%
rename from ld/testsuite/ld-elfvsb/hidden2.d
rename to ld/testsuite/ld-vsb/hidden2-elf.d
diff --git a/ld/testsuite/ld-elfvsb/hidden2.ld b/ld/testsuite/ld-vsb/hidden2.ld
similarity index 100%
rename from ld/testsuite/ld-elfvsb/hidden2.ld
rename to ld/testsuite/ld-vsb/hidden2.ld
diff --git a/ld/testsuite/ld-elfvsb/hidden2.s b/ld/testsuite/ld-vsb/hidden2.s
similarity index 100%
rename from ld/testsuite/ld-elfvsb/hidden2.s
rename to ld/testsuite/ld-vsb/hidden2.s
diff --git a/ld/testsuite/ld-elfvsb/internal0.d b/ld/testsuite/ld-vsb/internal0-elf.d
similarity index 100%
rename from ld/testsuite/ld-elfvsb/internal0.d
rename to ld/testsuite/ld-vsb/internal0-elf.d
diff --git a/ld/testsuite/ld-elfvsb/internal1.d b/ld/testsuite/ld-vsb/internal1-elf.d
similarity index 100%
rename from ld/testsuite/ld-elfvsb/internal1.d
rename to ld/testsuite/ld-vsb/internal1-elf.d
diff --git a/ld/testsuite/ld-elfvsb/main.c b/ld/testsuite/ld-vsb/main.c
similarity index 100%
rename from ld/testsuite/ld-elfvsb/main.c
rename to ld/testsuite/ld-vsb/main.c
diff --git a/ld/testsuite/ld-elfvsb/protected0.d b/ld/testsuite/ld-vsb/protected0-elf.d
similarity index 100%
rename from ld/testsuite/ld-elfvsb/protected0.d
rename to ld/testsuite/ld-vsb/protected0-elf.d
diff --git a/ld/testsuite/ld-elfvsb/protected1.d b/ld/testsuite/ld-vsb/protected1-elf.d
similarity index 100%
rename from ld/testsuite/ld-elfvsb/protected1.d
rename to ld/testsuite/ld-vsb/protected1-elf.d
diff --git a/ld/testsuite/ld-elfvsb/sh1.c b/ld/testsuite/ld-vsb/sh1.c
similarity index 100%
rename from ld/testsuite/ld-elfvsb/sh1.c
rename to ld/testsuite/ld-vsb/sh1.c
diff --git a/ld/testsuite/ld-elfvsb/sh2.c b/ld/testsuite/ld-vsb/sh2.c
similarity index 100%
rename from ld/testsuite/ld-elfvsb/sh2.c
rename to ld/testsuite/ld-vsb/sh2.c
diff --git a/ld/testsuite/ld-elfvsb/sh3.c b/ld/testsuite/ld-vsb/sh3.c
similarity index 100%
rename from ld/testsuite/ld-elfvsb/sh3.c
rename to ld/testsuite/ld-vsb/sh3.c
diff --git a/ld/testsuite/ld-elfvsb/test.c b/ld/testsuite/ld-vsb/test.c
similarity index 100%
rename from ld/testsuite/ld-elfvsb/test.c
rename to ld/testsuite/ld-vsb/test.c
diff --git a/ld/testsuite/ld-elfvsb/undef.s b/ld/testsuite/ld-vsb/undef.s
similarity index 100%
rename from ld/testsuite/ld-elfvsb/undef.s
rename to ld/testsuite/ld-vsb/undef.s
diff --git a/ld/testsuite/ld-elfvsb/elfvsb.exp b/ld/testsuite/ld-vsb/vsb.exp
similarity index 99%
rename from ld/testsuite/ld-elfvsb/elfvsb.exp
rename to ld/testsuite/ld-vsb/vsb.exp
index c21913112fa..52a7d6b5f74 100644
--- a/ld/testsuite/ld-elfvsb/elfvsb.exp
+++ b/ld/testsuite/ld-vsb/vsb.exp
@@ -49,7 +49,7 @@ if { ![istarget hppa*64*-*-hpux*] \
     return
 }
 
-set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
+set test_list [lsort [glob -nocomplain $srcdir/$subdir/*-elf.d]]
 foreach t $test_list {
     # We need to strip the ".d", but can leave the dirname.
     verbose [file rootname $t]