diff --git a/test/CodeGen/2008-07-30-implicit-initialization.c b/test/CodeGen/2008-07-30-implicit-initialization.c
index ee33b6d70c..9dd05bffbf 100644
--- a/test/CodeGen/2008-07-30-implicit-initialization.c
+++ b/test/CodeGen/2008-07-30-implicit-initialization.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t &&
+// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 2 &&
 // RUN: grep "ret i32 0" %t | count 2
 // <rdar://problem/6113085>
diff --git a/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c b/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
index 746a2f34c9..f1243dcbde 100644
--- a/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
+++ b/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis | grep "ret i32 1" | count 3
+// RUN: clang -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis | grep "ret i32 1" | count 3
 // <rdr://6115726>
 
 int f0() {
diff --git a/test/CodeGen/PR2001-bitfield-reload.c b/test/CodeGen/PR2001-bitfield-reload.c
index caafced935..7474f3e5c0 100644
--- a/test/CodeGen/PR2001-bitfield-reload.c
+++ b/test/CodeGen/PR2001-bitfield-reload.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t &&
+// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 1 &&
 // RUN: grep "ret i32 1" %t | count 1
 // PR2001
diff --git a/test/CodeGen/bitfield-assign.c b/test/CodeGen/bitfield-assign.c
index fc163b4d3b..0453d77ba0 100644
--- a/test/CodeGen/bitfield-assign.c
+++ b/test/CodeGen/bitfield-assign.c
@@ -4,12 +4,12 @@
 /* Check that we get one load for each simple assign and two for the
    compound assign (load the old value before the add then load again
    to store back). Also check that our g0 pattern is good. */
-// RUN: clang -O0 -emit-llvm -o %t %s &&
+// RUN: clang -triple i386-unknown-unknown -O0 -emit-llvm -o %t %s &&
 // RUN: grep 'load ' %t | count 5 &&
 // RUN: grep "@g0" %t | count 4 &&
 
 // Check that we got the right value.
-// RUN: clang -O3 -emit-llvm -o %t %s &&
+// RUN: clang -triple i386-unknown-unknown -O3 -emit-llvm -o %t %s &&
 // RUN: grep 'load ' %t | count 0 &&
 // RUN: grep "@g0" %t | count 0
 
diff --git a/test/CodeGen/bitfield.c b/test/CodeGen/bitfield.c
index 5d522682ef..6473d0760f 100644
--- a/test/CodeGen/bitfield.c
+++ b/test/CodeGen/bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang -triple i386-unknown-unknown %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 4 &&
 // RUN: grep "ret i32 1" %t | count 4
 
diff --git a/test/CodeGen/designated-initializers.c b/test/CodeGen/designated-initializers.c
index 0601818494..617c4287d5 100644
--- a/test/CodeGen/designated-initializers.c
+++ b/test/CodeGen/designated-initializers.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o - | grep "<{ i8\* null, i32 1024 }>"
+// RUN: clang -triple i386-unknown-unknown %s -emit-llvm -o - | grep "<{ i8\* null, i32 1024 }>"
 
 struct foo {
     void *a;
diff --git a/test/CodeGen/enum.c b/test/CodeGen/enum.c
index c8641926ee..50b558d250 100644
--- a/test/CodeGen/enum.c
+++ b/test/CodeGen/enum.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis | grep 'ret i32 6'
+// RUN: clang -triple i386-unknown-unknown %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis | grep 'ret i32 6'
 
 static enum { foo, bar = 1U } z;
 
diff --git a/test/CodeGen/function-attributes.c b/test/CodeGen/function-attributes.c
index c09b2af9f4..dacfdd9675 100644
--- a/test/CodeGen/function-attributes.c
+++ b/test/CodeGen/function-attributes.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang -triple i386-unknown-unknown -emit-llvm -o %t %s &&
 // RUN: grep 'define signext i8 @f0(i32 %x) nounwind' %t &&
 // RUN: grep 'define zeroext i8 @f1(i32 %x) nounwind' %t &&
 // RUN: grep 'define void @f2(i8 signext %x) nounwind' %t &&
diff --git a/test/CodeGen/indirect-goto.c b/test/CodeGen/indirect-goto.c
index c0dc8a8298..62c2726d69 100644
--- a/test/CodeGen/indirect-goto.c
+++ b/test/CodeGen/indirect-goto.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 1 &&
 // RUN: grep "ret i32 210" %t | count 1
 
diff --git a/test/CodeGen/kr-func-promote.c b/test/CodeGen/kr-func-promote.c
index a20532a976..2b55a39be0 100644
--- a/test/CodeGen/kr-func-promote.c
+++ b/test/CodeGen/kr-func-promote.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o - | grep "i32 @a(i32)"
+// RUN: clang -triple i386-unknown-unknown %s -emit-llvm -o - | grep "i32 @a(i32)"
 
 int a();
 int a(x) short x; {return x;}
diff --git a/test/CodeGen/rdr-6095112-alias-references-inline.c b/test/CodeGen/rdr-6095112-alias-references-inline.c
index 4805d47c16..7407fc1f7d 100644
--- a/test/CodeGen/rdr-6095112-alias-references-inline.c
+++ b/test/CodeGen/rdr-6095112-alias-references-inline.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm -o %t %s &&
+// RUN: clang -triple i386-unknown-unknown --emit-llvm -o %t %s &&
 // RUN: grep -e "alias" %t
 // XFAIL
 
diff --git a/test/CodeGen/rdr-6098585-default-after-caserange.c b/test/CodeGen/rdr-6098585-default-after-caserange.c
index 1a7a53fc7f..c6dbb1ce18 100644
--- a/test/CodeGen/rdr-6098585-default-after-caserange.c
+++ b/test/CodeGen/rdr-6098585-default-after-caserange.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 1 && 
 // RUN: grep "ret i32 10" %t | count 1
 
diff --git a/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c b/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c
index 7cb9384cde..bad9889de6 100644
--- a/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c
+++ b/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32 10" %t
 
 // Ensure that this doesn't compile to infinite loop in g() due to
diff --git a/test/CodeGen/rdr-6098585-empty-case-range.c b/test/CodeGen/rdr-6098585-empty-case-range.c
index 2dc3cf3da8..6da76bdf24 100644
--- a/test/CodeGen/rdr-6098585-empty-case-range.c
+++ b/test/CodeGen/rdr-6098585-empty-case-range.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 2 &&
 // RUN: grep "ret i32 3" %t | count 2
 
diff --git a/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c b/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c
index 007a0c7587..e0fcc80391 100644
--- a/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c
+++ b/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32 %" %t
 
 // Make sure return is not constant (if empty range is skipped or miscompiled)
diff --git a/test/CodeGen/rdr-6098585-unsigned-caserange.c b/test/CodeGen/rdr-6098585-unsigned-caserange.c
index adf825c813..1fa44c0a2e 100644
--- a/test/CodeGen/rdr-6098585-unsigned-caserange.c
+++ b/test/CodeGen/rdr-6098585-unsigned-caserange.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 1 &&
 // RUN: grep "ret i32 3" %t | count 1
 
diff --git a/test/CodeGen/rdr-6140807-alias-references-forward.c b/test/CodeGen/rdr-6140807-alias-references-forward.c
index 5fe15d177d..509ed74849 100644
--- a/test/CodeGen/rdr-6140807-alias-references-forward.c
+++ b/test/CodeGen/rdr-6140807-alias-references-forward.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang -triple i386-unknown-unknown -emit-llvm -o %t %s &&
 // RUN: grep -e "@f = alias" %t | count 1 &&
 // RUN: grep -e "bitcast (i32 (i32)\\* @f to i32 (float)\\*)" %t | count 1
 // <rdar://problem/6140807>