diff --git a/llvm/test/Archive/extract.ll b/llvm/test/Archive/extract.ll
new file mode 100644
index 000000000000..3649714259b8
--- /dev/null
+++ b/llvm/test/Archive/extract.ll
@@ -0,0 +1,16 @@
+; This isn't really an assembly file, its just here to run the test.
+
+; This test just makes sure that llvm-ar can extract bytecode members
+; from various style archives.
+
+; RUN: llvm-ar x %p/GNU.a very_long_bytecode_file_name.bc
+; RUN: diff %p/very_long_bytecode_file_name.bc very_long_bytecode_file_name.bc >/dev/null 2>/dev/null
+
+; RUN: llvm-ar x %p/MacOSX.a very_long_bytecode_file_name.bc
+; RUN: diff %p/very_long_bytecode_file_name.bc very_long_bytecode_file_name.bc > /dev/null 2>/dev/null
+
+; RUN: llvm-ar x %p/SVR4.a very_long_bytecode_file_name.bc
+; RUN: diff %p/very_long_bytecode_file_name.bc very_long_bytecode_file_name.bc >/dev/null 2>/dev/null
+
+; RUN: llvm-ar x %p/xpg4.a very_long_bytecode_file_name.bc
+; RUN: diff %p/very_long_bytecode_file_name.bc very_long_bytecode_file_name.bc >/dev/null 2>/dev/null
diff --git a/llvm/test/Archive/extract_GNU.ll b/llvm/test/Archive/extract_GNU.ll
deleted file mode 100644
index f19840a14e5f..000000000000
--- a/llvm/test/Archive/extract_GNU.ll
+++ /dev/null
@@ -1,5 +0,0 @@
-;This isn't really an assembly file, its just here to run the test.
-;This test just makes sure that llvm-ar can extract bytecode members
-;from GNU style archives
-;RUN: llvm-ar x %p/GNU.a very_long_bytecode_file_name.bc
-;RUN: diff %p/very_long_bytecode_file_name.bc very_long_bytecode_file_name.bc >/dev/null 2>/dev/null
diff --git a/llvm/test/Archive/extract_MacOSX.ll b/llvm/test/Archive/extract_MacOSX.ll
deleted file mode 100644
index c811a59b33a2..000000000000
--- a/llvm/test/Archive/extract_MacOSX.ll
+++ /dev/null
@@ -1,6 +0,0 @@
-;This isn't really an assembly file, its just here to run the test.
-;This test just makes sure that llvm-ar can extract bytecode members
-;from MacOSX style archives
-
-;RUN: llvm-ar x %p/MacOSX.a very_long_bytecode_file_name.bc
-;RUN: diff %p/very_long_bytecode_file_name.bc very_long_bytecode_file_name.bc > /dev/null 2>/dev/null
diff --git a/llvm/test/Archive/extract_SVR4.ll b/llvm/test/Archive/extract_SVR4.ll
deleted file mode 100644
index 446d52c211cd..000000000000
--- a/llvm/test/Archive/extract_SVR4.ll
+++ /dev/null
@@ -1,6 +0,0 @@
-;This isn't really an assembly file, its just here to run the test.
-;This test just makes sure that llvm-ar can extract bytecode members
-;from SVR4 style archives
-
-;RUN: llvm-ar x %p/SVR4.a very_long_bytecode_file_name.bc
-;RUN: diff %p/very_long_bytecode_file_name.bc very_long_bytecode_file_name.bc >/dev/null 2>/dev/null
diff --git a/llvm/test/Archive/extract_xpg4.ll b/llvm/test/Archive/extract_xpg4.ll
deleted file mode 100644
index c816d914d29e..000000000000
--- a/llvm/test/Archive/extract_xpg4.ll
+++ /dev/null
@@ -1,6 +0,0 @@
-;This isn't really an assembly file, its just here to run the test.
-;This test just makes sure that llvm-ar can extract bytecode members
-;from xpg4 style archives
-
-;RUN: llvm-ar x %p/xpg4.a very_long_bytecode_file_name.bc
-;RUN: diff %p/very_long_bytecode_file_name.bc very_long_bytecode_file_name.bc >/dev/null 2>/dev/null