diff --git a/test/Linker/visibility2.ll b/test/Linker/Inputs/visibility.ll
similarity index 80%
rename from test/Linker/visibility2.ll
rename to test/Linker/Inputs/visibility.ll
index 4fabf6f8d12..f5b2065b85f 100644
--- a/test/Linker/visibility2.ll
+++ b/test/Linker/Inputs/visibility.ll
@@ -1,7 +1,3 @@
-; This file is used by visibility1.ll, so it doesn't actually do anything itself
-;
-; RUN: true
-
 ; Variables
 @v1 = weak hidden global i32 0
 @v2 = weak protected global i32 0
diff --git a/test/Linker/visibility1.ll b/test/Linker/visibility.ll
similarity index 77%
rename from test/Linker/visibility1.ll
rename to test/Linker/visibility.ll
index 131f6d59b5e..fc950fa1d89 100644
--- a/test/Linker/visibility1.ll
+++ b/test/Linker/visibility.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-link %s %p/visibility2.ll -S | FileCheck %s
-; RUN: llvm-link %p/visibility2.ll %s -S | FileCheck %s
+; RUN: llvm-link %s %p/Inputs/visibility.ll -S | FileCheck %s
+; RUN: llvm-link %p/Inputs/visibility.ll %s -S | FileCheck %s
 
-; The values in this file are strong, the ones in visibility2.ll are weak,
+; The values in this file are strong, the ones in Inputs/visibility.ll are weak,
 ; but we should still get the visibility from them.
 
 ; Variables