diff --git a/clang/test/CodeGen/struct.c b/clang/test/CodeGen/struct.c
index c71796d9da10..208cbd5ca9d0 100644
--- a/clang/test/CodeGen/struct.c
+++ b/clang/test/CodeGen/struct.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang -triple i386-unknown-unknown %s -emit-llvm -o -
 
 struct  {
   int x;
diff --git a/clang/test/CodeGenObjC/bitfield-1.m b/clang/test/CodeGenObjC/bitfield-1.m
index 7d932934164a..d4a63d3d0e02 100644
--- a/clang/test/CodeGenObjC/bitfield-1.m
+++ b/clang/test/CodeGenObjC/bitfield-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang -fnext-runtime -emit-llvm -o %t %s
 
 @interface Object
 - (id) alloc;
diff --git a/clang/test/CodeGenObjC/category-super-class-meth.m b/clang/test/CodeGenObjC/category-super-class-meth.m
index 4385b56774ea..82ced6331864 100644
--- a/clang/test/CodeGenObjC/category-super-class-meth.m
+++ b/clang/test/CodeGenObjC/category-super-class-meth.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang -fnext-runtime -emit-llvm -o %t %s
 
 @interface BASE
 + (int) BaseMeth;
diff --git a/clang/test/CodeGenObjC/message-arrays.m b/clang/test/CodeGenObjC/message-arrays.m
index 55b5d9b84ef0..aed841e06fd9 100644
--- a/clang/test/CodeGenObjC/message-arrays.m
+++ b/clang/test/CodeGenObjC/message-arrays.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang -fnext-runtime -emit-llvm -o %t %s
 
 void f0(id a) {
   // This should have an implicit cast
diff --git a/clang/test/CodeGenObjC/property-incr-decr-1.m b/clang/test/CodeGenObjC/property-incr-decr-1.m
index 4ca84f1fb75c..ef55342514c8 100644
--- a/clang/test/CodeGenObjC/property-incr-decr-1.m
+++ b/clang/test/CodeGenObjC/property-incr-decr-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang -fnext-runtime -emit-llvm -o %t %s
 
 @interface Object
 - (id) new;