diff --git a/test/CFrontend/2005-09-24-AsmUserPrefix.c b/test/CFrontend/2005-09-24-AsmUserPrefix.c
index 06600fa84af..9db7f692704 100644
--- a/test/CFrontend/2005-09-24-AsmUserPrefix.c
+++ b/test/CFrontend/2005-09-24-AsmUserPrefix.c
@@ -1,6 +1,7 @@
-// RUN: %llvmgcc %s -S -o - | gccas &&
-// RUN: %llvmgcc %s -S -o - | gccas | llc &&
-// RUN: %llvmgcc %s -S -o - | gccas | llc | not grep _foo2
+// RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts &&
+// RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | llc &&
+// RUN: %llvmgcc %s -S -o - | llvm-as | llc -std-compile-opts | llc | \
+// RUN:    not grep _foo2
 
 void foo() __asm__("foo2");
 
diff --git a/test/CFrontend/2006-01-13-Includes.c b/test/CFrontend/2006-01-13-Includes.c
index fcaf3740769..5847e9ee453 100644
--- a/test/CFrontend/2006-01-13-Includes.c
+++ b/test/CFrontend/2006-01-13-Includes.c
@@ -1,4 +1,5 @@
-// RUN: %llvmgcc %s -g -S -o - | gccas | llvm-dis | grep "test/CFrontend"
+// RUN: %llvmgcc %s -g -S -o - | llvm-as | opt -std-compile-opts | \
+// RUN:   llvm-dis | grep "test/CFrontend"
 // PR676
 
 #include <stdio.h>
diff --git a/test/CFrontend/2006-01-13-StackSave.c b/test/CFrontend/2006-01-13-StackSave.c
index 7522dd56e02..dfe00fbde33 100644
--- a/test/CFrontend/2006-01-13-StackSave.c
+++ b/test/CFrontend/2006-01-13-StackSave.c
@@ -1,6 +1,6 @@
-// RUN: %llvmgcc %s -S -o - | gccas | llvm-dis | grep llvm.stacksave
-
 // PR691
+// RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | \
+// RUN:    llvm-dis | grep llvm.stacksave
 
 void test(int N) {
   int i;
diff --git a/test/CFrontend/2006-01-23-FileScopeAsm.c b/test/CFrontend/2006-01-23-FileScopeAsm.c
index 8fae8c71376..14f85ac0b6a 100644
--- a/test/CFrontend/2006-01-23-FileScopeAsm.c
+++ b/test/CFrontend/2006-01-23-FileScopeAsm.c
@@ -1,4 +1,5 @@
-// RUN: %llvmgcc %s -S -o - | gccas | llvm-dis | grep foo[12345] | wc -l | grep 5
+// RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | \
+// RUN:    llvm-dis | grep foo[12345] | wc -l | grep 5
 
 __asm__ ("foo1");
 __asm__ ("foo2");
diff --git a/test/CFrontend/2006-03-03-MissingInitializer.c b/test/CFrontend/2006-03-03-MissingInitializer.c
index 5a2acb588c0..e791784e509 100644
--- a/test/CFrontend/2006-03-03-MissingInitializer.c
+++ b/test/CFrontend/2006-03-03-MissingInitializer.c
@@ -1,4 +1,5 @@
-// RUN: %llvmgcc %s -S -o - | gccas | llvm-dis | grep nate | grep 'global i32 0'
+// RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | \
+// RUN:    llvm-dis | grep '@nate.*internal global i32 0'
 
 struct X { int *XX; int Y;};