diff --git a/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll b/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
index 23c92b650c9..edc51472ffd 100644
--- a/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
+++ b/test/Transforms/LICM/2003-02-27-NestedLoopExitBlocks.ll
@@ -1,6 +1,6 @@
 ; Exit blocks need to be updated for all nested loops...
 
-; RUN: llvm-as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -loopsimplify
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/LoopPreheaders/2003-04-25-AssertFail.ll b/test/Transforms/LoopPreheaders/2003-04-25-AssertFail.ll
index a4c733016f7..8a07caba572 100644
--- a/test/Transforms/LoopPreheaders/2003-04-25-AssertFail.ll
+++ b/test/Transforms/LoopPreheaders/2003-04-25-AssertFail.ll
@@ -1,7 +1,7 @@
 ; This testcase exposed a problem with the loop identification pass (LoopInfo).
 ; Basically, it was incorrectly calculating the loop nesting information.
 ;
-; RUN: llvm-as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -loopsimplify
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/LoopPreheaders/2003-05-12-PreheaderExitOfChild.ll b/test/Transforms/LoopPreheaders/2003-05-12-PreheaderExitOfChild.ll
index 23824293c5b..4bff954484a 100644
--- a/test/Transforms/LoopPreheaders/2003-05-12-PreheaderExitOfChild.ll
+++ b/test/Transforms/LoopPreheaders/2003-05-12-PreheaderExitOfChild.ll
@@ -2,7 +2,7 @@
 ; inserted for the "fail" loop, but the exit block of a loop is not updated
 ; to be the preheader instead of the exit loop itself.
 
-; RUN: llvm-as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -loopsimplify
 
 int %re_match_2() {
 	br label %loopentry.1
diff --git a/test/Transforms/LoopPreheaders/basictest.ll b/test/Transforms/LoopPreheaders/basictest.ll
index 294140b02e7..a8835df64f1 100644
--- a/test/Transforms/LoopPreheaders/basictest.ll
+++ b/test/Transforms/LoopPreheaders/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -loopsimplify
 
 implementation
 
diff --git a/test/Transforms/LoopPreheaders/hardertest.ll b/test/Transforms/LoopPreheaders/hardertest.ll
index 9179c49a99c..04a2739adeb 100644
--- a/test/Transforms/LoopPreheaders/hardertest.ll
+++ b/test/Transforms/LoopPreheaders/hardertest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -loopsimplify
 
 void %foo(bool %C) {
 	br bool %C, label %T, label %F
diff --git a/test/Transforms/LoopSimplify/2003-04-25-AssertFail.ll b/test/Transforms/LoopSimplify/2003-04-25-AssertFail.ll
index a4c733016f7..8a07caba572 100644
--- a/test/Transforms/LoopSimplify/2003-04-25-AssertFail.ll
+++ b/test/Transforms/LoopSimplify/2003-04-25-AssertFail.ll
@@ -1,7 +1,7 @@
 ; This testcase exposed a problem with the loop identification pass (LoopInfo).
 ; Basically, it was incorrectly calculating the loop nesting information.
 ;
-; RUN: llvm-as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -loopsimplify
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll b/test/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll
index 23824293c5b..4bff954484a 100644
--- a/test/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll
+++ b/test/Transforms/LoopSimplify/2003-05-12-PreheaderExitOfChild.ll
@@ -2,7 +2,7 @@
 ; inserted for the "fail" loop, but the exit block of a loop is not updated
 ; to be the preheader instead of the exit loop itself.
 
-; RUN: llvm-as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -loopsimplify
 
 int %re_match_2() {
 	br label %loopentry.1
diff --git a/test/Transforms/LoopSimplify/basictest.ll b/test/Transforms/LoopSimplify/basictest.ll
index 294140b02e7..a8835df64f1 100644
--- a/test/Transforms/LoopSimplify/basictest.ll
+++ b/test/Transforms/LoopSimplify/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -loopsimplify
 
 implementation
 
diff --git a/test/Transforms/LoopSimplify/hardertest.ll b/test/Transforms/LoopSimplify/hardertest.ll
index 9179c49a99c..04a2739adeb 100644
--- a/test/Transforms/LoopSimplify/hardertest.ll
+++ b/test/Transforms/LoopSimplify/hardertest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -preheaders
+; RUN: llvm-as < %s | opt -loopsimplify
 
 void %foo(bool %C) {
 	br bool %C, label %T, label %F