diff --git a/test/Archive/ranlib_GNU.ll b/test/Archive/ranlib_GNU.ll
index 289303a585d..00522801f53 100644
--- a/test/Archive/ranlib_GNU.ll
+++ b/test/Archive/ranlib_GNU.ll
@@ -4,9 +4,4 @@
 ;RUN: cp %p/GNU.a %t.GNU.a
 ;RUN: llvm-ranlib %t.GNU.a
 ;RUN: llvm-ar t %t.GNU.a > %t1
-;RUN: grep -v '^;' %s >%t2
-;RUN: diff %t2 %t1
-evenlen
-oddlen
-very_long_bytecode_file_name.bc
-IsNAN.o
+;RUN: diff %t1 %p/GNU.toc
diff --git a/test/Archive/ranlib_MacOSX.ll b/test/Archive/ranlib_MacOSX.ll
index 50fe5cd38a1..a22b4193917 100644
Binary files a/test/Archive/ranlib_MacOSX.ll and b/test/Archive/ranlib_MacOSX.ll differ
diff --git a/test/Archive/ranlib_SVR4.ll b/test/Archive/ranlib_SVR4.ll
index e1cd79b8dde..d5f4b5ae58f 100644
--- a/test/Archive/ranlib_SVR4.ll
+++ b/test/Archive/ranlib_SVR4.ll
@@ -4,9 +4,4 @@
 ;RUN: cp %p/SVR4.a %t.SVR4.a
 ;RUN: llvm-ranlib %t.SVR4.a
 ;RUN: llvm-ar t %t.SVR4.a > %t1
-;RUN: grep -v '^;' %s >%t2
-;RUN: diff %t2 %t1
-evenlen
-oddlen
-very_long_bytecode_file_name.bc
-IsNAN.o
+;RUN: diff %t1 %p/SVR4.toc
diff --git a/test/Archive/ranlib_xpg4.ll b/test/Archive/ranlib_xpg4.ll
index f36c93c6c94..f859cacb04d 100644
--- a/test/Archive/ranlib_xpg4.ll
+++ b/test/Archive/ranlib_xpg4.ll
@@ -4,9 +4,4 @@
 ;RUN: cp %p/xpg4.a %t.xpg4.a
 ;RUN: llvm-ranlib %t.xpg4.a
 ;RUN: llvm-ar t %t.xpg4.a > %t1
-;RUN: grep -v '^;' %s >%t2
-;RUN: diff %t2 %t1
-evenlen
-oddlen
-very_long_bytecode_file_name.bc
-IsNAN.o
+;RUN: diff %t1 %p/xpg4.toc
diff --git a/test/Archive/toc_GNU.ll b/test/Archive/toc_GNU.ll
index 3aeded259aa..136f603a831 100644
--- a/test/Archive/toc_GNU.ll
+++ b/test/Archive/toc_GNU.ll
@@ -2,9 +2,4 @@
 ;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: grep -v '^;' %s >%t2
-;RUN: diff %t2 %t1
-evenlen
-oddlen
-very_long_bytecode_file_name.bc
-IsNAN.o
+;RUN: diff %t1 %p/GNU.toc
diff --git a/test/Archive/toc_MacOSX.ll b/test/Archive/toc_MacOSX.ll
index 331816bddb0..fb032232408 100644
Binary files a/test/Archive/toc_MacOSX.ll and b/test/Archive/toc_MacOSX.ll differ
diff --git a/test/Archive/toc_SVR4.ll b/test/Archive/toc_SVR4.ll
index 9f8bdba207d..930a26fd353 100644
--- a/test/Archive/toc_SVR4.ll
+++ b/test/Archive/toc_SVR4.ll
@@ -2,9 +2,4 @@
 ;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: grep -v '^;' %s >%t2
-;RUN: diff %t2 %t1
-evenlen
-oddlen
-very_long_bytecode_file_name.bc
-IsNAN.o
+;RUN: diff %t1 %p/SVR4.toc
diff --git a/test/Archive/toc_xpg4.ll b/test/Archive/toc_xpg4.ll
index f2984e27d7e..441af036f3c 100644
--- a/test/Archive/toc_xpg4.ll
+++ b/test/Archive/toc_xpg4.ll
@@ -2,9 +2,4 @@
 ;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: grep -v '^;' %s >%t2
-;RUN: diff %t2 %t1
-evenlen
-oddlen
-very_long_bytecode_file_name.bc
-IsNAN.o
+;RUN: diff %t1 %p/xpg4.toc