diff --git a/polly/test/CodeGen/do_pluto_matmult.ll b/polly/test/CodeGen/do_pluto_matmult.ll
index 34f3c05aa5a8..126f377133e4 100644
--- a/polly/test/CodeGen/do_pluto_matmult.ll
+++ b/polly/test/CodeGen/do_pluto_matmult.ll
@@ -4,7 +4,6 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=valid_reverse -polly-cloog -analyze %s | FileCheck -check-prefix=REVERSE %s > /dev/null
 ; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=invalid_reverse -polly-cloog -analyze %s 2>&1  | FileCheck -check-prefix=INVALID %s > /dev/null
 ; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -analyze  %s | FileCheck -check-prefix=IMPORT %s
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen %s | lli | diff %s.result -  %EatErrOnX86
 ; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen -S %s | FileCheck -check-prefix=CODEGEN %s
 
 
diff --git a/polly/test/CodeGen/loop_with_condition.ll b/polly/test/CodeGen/loop_with_condition.ll
index db5b9c18cac1..1d825b197ab4 100644
--- a/polly/test/CodeGen/loop_with_condition.ll
+++ b/polly/test/CodeGen/loop_with_condition.ll
@@ -1,6 +1,4 @@
-; ModuleID = 'loop_with_condition.s'
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli %EatErrOnX86
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-pc-linux-gnu"
diff --git a/polly/test/CodeGen/loop_with_condition_2.ll b/polly/test/CodeGen/loop_with_condition_2.ll
index dd02e58133c0..07fbc3753a1d 100644
--- a/polly/test/CodeGen/loop_with_condition_2.ll
+++ b/polly/test/CodeGen/loop_with_condition_2.ll
@@ -1,7 +1,5 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli %EatErrOnX86
 
-; ModuleID = 'loop_with_condition_2.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/CodeGen/loop_with_condition_ineq.ll b/polly/test/CodeGen/loop_with_condition_ineq.ll
index d434e4ee6b94..3dd29b5fa427 100644
--- a/polly/test/CodeGen/loop_with_condition_ineq.ll
+++ b/polly/test/CodeGen/loop_with_condition_ineq.ll
@@ -1,6 +1,4 @@
-; ModuleID = 'loop_with_condition_ineq.s'
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli %EatErrOnX86
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-pc-linux-gnu"
 
diff --git a/polly/test/CodeGen/loop_with_condition_nested.ll b/polly/test/CodeGen/loop_with_condition_nested.ll
index b686f71ff522..3b24dd9e0f1e 100644
--- a/polly/test/CodeGen/loop_with_condition_nested.ll
+++ b/polly/test/CodeGen/loop_with_condition_nested.ll
@@ -1,5 +1,4 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli %EatErrOnX86
 ; ModuleID = 'loop_with_condition_nested.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-pc-linux-gnu"
diff --git a/polly/test/CodeGen/reduction.ll b/polly/test/CodeGen/reduction.ll
index 592f6f207281..25a4f94a4450 100644
--- a/polly/test/CodeGen/reduction.ll
+++ b/polly/test/CodeGen/reduction.ll
@@ -1,7 +1,4 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-codegen -S %s 2>&1 | not FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen | lli
-; XFAIL: *
-; ModuleID = 'reduction.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-pc-linux-gnu"
 
diff --git a/polly/test/CodeGen/reduction_2.ll b/polly/test/CodeGen/reduction_2.ll
index 51a38da9eba5..76682bec1e13 100644
--- a/polly/test/CodeGen/reduction_2.ll
+++ b/polly/test/CodeGen/reduction_2.ll
@@ -1,5 +1,4 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli %EatErrOnX86
 ; ModuleID = 'reduction_2.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/polly/test/CodeGen/sequential_loops.ll b/polly/test/CodeGen/sequential_loops.ll
index 6893a836caf0..56bad0a65620 100644
--- a/polly/test/CodeGen/sequential_loops.ll
+++ b/polly/test/CodeGen/sequential_loops.ll
@@ -1,5 +1,4 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli - %EatErrOnX86
 ; ModuleID = 'sequential_loops.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-pc-linux-gnu"
diff --git a/polly/test/CodeGen/single_do_loop_int_max_iterations.ll b/polly/test/CodeGen/single_do_loop_int_max_iterations.ll
index b2fa1e61bad9..0174cee4648e 100644
--- a/polly/test/CodeGen/single_do_loop_int_max_iterations.ll
+++ b/polly/test/CodeGen/single_do_loop_int_max_iterations.ll
@@ -1,8 +1,4 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze  -S %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -O3 %s | lli %EatErrOnX86
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -O3 %s | lli %EatErrOnX86
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%d -polly-codegen %s | lli %EatErrOnX86
-; ModuleID = 'single_do_loop_int_max_iterations.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/CodeGen/single_do_loop_one_iteration.ll b/polly/test/CodeGen/single_do_loop_one_iteration.ll
index d9bf16ab1660..dbe4af37b708 100644
--- a/polly/test/CodeGen/single_do_loop_one_iteration.ll
+++ b/polly/test/CodeGen/single_do_loop_one_iteration.ll
@@ -1,5 +1,4 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog-scop -S -analyze  %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -O3 %s | lli
 ; XFAIL: *
 ; ModuleID = 'single_do_loop_one_iteration.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
diff --git a/polly/test/CodeGen/single_do_loop_scev_replace.ll b/polly/test/CodeGen/single_do_loop_scev_replace.ll
index 7fdfad62af95..2f95aa7e72a5 100644
--- a/polly/test/CodeGen/single_do_loop_scev_replace.ll
+++ b/polly/test/CodeGen/single_do_loop_scev_replace.ll
@@ -1,6 +1,4 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts %s | lli %EatErrOnX86
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli %EatErrOnX86
 ; ModuleID = 'single_do_loop_scev_replace.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/polly/test/CodeGen/single_loop.ll b/polly/test/CodeGen/single_loop.ll
index 7bb2675645f6..fd5fb3d79197 100644
--- a/polly/test/CodeGen/single_loop.ll
+++ b/polly/test/CodeGen/single_loop.ll
@@ -1,5 +1,4 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli - %EatErrOnX86
 ; ModuleID = 'single_loop.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/polly/test/CodeGen/single_loop_int_max_iterations.ll b/polly/test/CodeGen/single_loop_int_max_iterations.ll
index 3dc93b31d93f..c5f7eae9c1ef 100644
--- a/polly/test/CodeGen/single_loop_int_max_iterations.ll
+++ b/polly/test/CodeGen/single_loop_int_max_iterations.ll
@@ -1,7 +1,5 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze  -S %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -O3 %s | lli
 
-; ModuleID = 'single_loop_int_max_iterations.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/CodeGen/single_loop_param.ll b/polly/test/CodeGen/single_loop_param.ll
index 02b45845bd1c..567587dda2a3 100644
--- a/polly/test/CodeGen/single_loop_param.ll
+++ b/polly/test/CodeGen/single_loop_param.ll
@@ -1,6 +1,4 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli - %EatErrOnX86
-; ModuleID = 'single_loop_param.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-pc-linux-gnu"
 
diff --git a/polly/test/lit.site.cfg.in b/polly/test/lit.site.cfg.in
index 5e47acece809..7be5b5ec3e06 100644
--- a/polly/test/lit.site.cfg.in
+++ b/polly/test/lit.site.cfg.in
@@ -29,7 +29,6 @@ config.substitutions.append(('%loadPolly', '-load '
                              + config.polly_lib_dir + '/LLVMPolly@LLVM_SHLIBEXT@'))
 config.substitutions.append(('%defaultOpts', ' -basicaa -polly-prepare -polly-region-simplify'))
 config.substitutions.append(('%polybenchOpts', ' -O3 -loop-simplify -indvars '))
-config.substitutions.append(('%EatErrOnX86', EAT_ERR_ON_X86))
 config.substitutions.append(('%vector-opt', '-polly-vectorizer=polly'))
 
 # Let the main config do the real work.