diff --git a/test/Archive/GNU.toc b/test/Archive/GNU.toc
deleted file mode 100644
index d9934139136..00000000000
--- a/test/Archive/GNU.toc
+++ /dev/null
@@ -1,4 +0,0 @@
-evenlen
-oddlen
-very_long_bytecode_file_name.bc
-IsNAN.o
diff --git a/test/Archive/MacOSX.toc b/test/Archive/MacOSX.toc
deleted file mode 100644
index f971df73325..00000000000
--- a/test/Archive/MacOSX.toc
+++ /dev/null
@@ -1,5 +0,0 @@
-__.SYMDEF SORTED
-evenlen
-oddlen
-very_long_bytecode_file_name.bc
-IsNAN.o
diff --git a/test/Archive/SVR4.toc b/test/Archive/SVR4.toc
deleted file mode 100644
index d9934139136..00000000000
--- a/test/Archive/SVR4.toc
+++ /dev/null
@@ -1,4 +0,0 @@
-evenlen
-oddlen
-very_long_bytecode_file_name.bc
-IsNAN.o
diff --git a/test/Archive/toc_GNU.ll b/test/Archive/toc_GNU.ll
index 136f603a831..9ed7d8eb8cb 100644
--- a/test/Archive/toc_GNU.ll
+++ b/test/Archive/toc_GNU.ll
@@ -1,5 +1,8 @@
 ;This isn't really an assembly file, its just here to run the test.
 ;This test just makes sure that llvm-ar can generate a table of contents for
 ;GNU style archives
-;RUN: llvm-ar t %p/GNU.a > %t1
-;RUN: diff %t1 %p/GNU.toc
+;RUN: llvm-ar t %p/GNU.a | FileCheck %s
+;CHECK:      evenlen
+;CHECK-NEXT: oddlen
+;CHECK-NEXT: very_long_bytecode_file_name.bc
+;CHECK-NEXT: IsNAN.o
diff --git a/test/Archive/toc_MacOSX.ll b/test/Archive/toc_MacOSX.ll
index fb032232408..6dbc9d2ea4a 100644
--- a/test/Archive/toc_MacOSX.ll
+++ b/test/Archive/toc_MacOSX.ll
@@ -1,5 +1,9 @@
 ;This isn't really an assembly file, its just here to run the test.
 ;This test just makes sure that llvm-ar can generate a table of contents for
 ;MacOSX style archives
-;RUN: llvm-ar t %p/MacOSX.a > %t1
-;RUN: diff %t1 %p/MacOSX.toc
+;RUN: llvm-ar t %p/MacOSX.a | FileCheck %s
+;CHECK:      __.SYMDEF SORTED
+;CHECK-NEXT: evenlen
+;CHECK-NEXT: oddlen
+;CHECK-NEXT: very_long_bytecode_file_name.bc
+;CHECK-NEXT: IsNAN.o
diff --git a/test/Archive/toc_SVR4.ll b/test/Archive/toc_SVR4.ll
index 930a26fd353..d447b921999 100644
--- a/test/Archive/toc_SVR4.ll
+++ b/test/Archive/toc_SVR4.ll
@@ -1,5 +1,8 @@
 ;This isn't really an assembly file, its just here to run the test.
 ;This test just makes sure that llvm-ar can generate a table of contents for
 ;SVR4 style archives
-;RUN: llvm-ar t %p/SVR4.a > %t1
-;RUN: diff %t1 %p/SVR4.toc
+;RUN: llvm-ar t %p/SVR4.a | FileCheck %s
+;CHECK:      evenlen
+;CHECK-NEXT: oddlen
+;CHECK-NEXT: very_long_bytecode_file_name.bc
+;CHECK-NEXT: IsNAN.o
diff --git a/test/Archive/toc_xpg4.ll b/test/Archive/toc_xpg4.ll
index 441af036f3c..fd875eebdaa 100644
--- a/test/Archive/toc_xpg4.ll
+++ b/test/Archive/toc_xpg4.ll
@@ -1,5 +1,8 @@
 ;This isn't really an assembly file, its just here to run the test.
 ;This test just makes sure that llvm-ar can generate a table of contents for
 ;xpg4 style archives
-;RUN: llvm-ar t %p/xpg4.a > %t1
-;RUN: diff %t1 %p/xpg4.toc
+;RUN: llvm-ar t %p/xpg4.a | FileCheck %s
+CHECK:      evenlen
+CHECK-NEXT: oddlen
+CHECK-NEXT: very_long_bytecode_file_name.bc
+CHECK-NEXT: IsNAN.o
diff --git a/test/Archive/xpg4.toc b/test/Archive/xpg4.toc
deleted file mode 100644
index d9934139136..00000000000
--- a/test/Archive/xpg4.toc
+++ /dev/null
@@ -1,4 +0,0 @@
-evenlen
-oddlen
-very_long_bytecode_file_name.bc
-IsNAN.o