diff --git a/src/gallium/drivers/i915/ci/deqp-i915-g33-flakes.txt b/src/gallium/drivers/i915/ci/deqp-i915-g33-flakes.txt
index 7535ee966c0..c08e59c06f6 100644
--- a/src/gallium/drivers/i915/ci/deqp-i915-g33-flakes.txt
+++ b/src/gallium/drivers/i915/ci/deqp-i915-g33-flakes.txt
@@ -1,8 +1,2 @@
 dEQP-GLES2.functional.shaders.discard.function_always
 dEQP-GLES2.functional.shaders.random.texture.*
-
-# Some of these compile fail, which results in drawing undefined
-# VARYING_SLOT_COL0 to the output, causing occasional passes in
-# tests that normally fail.
-dEQP-GLES2.functional.shaders.random.all_features.fragment.*
-dEQP-GLES2.functional.uniform_api.random.*
diff --git a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
index b3fa62ba926..058b43aef2b 100644
--- a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
+++ b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
@@ -720,8 +720,6 @@ spec@glsl-1.10@execution@loops@complex-loop-analysis-bug,Fail
 spec@glsl-1.10@execution@loops@glsl-fs-continue-inside-do-while,Fail
 spec@glsl-1.10@execution@loops@glsl-fs-loop-300,Fail
 spec@glsl-1.10@execution@loops@glsl-fs-loop-break,Fail
-spec@glsl-1.10@execution@loops@glsl-fs-loop-const-decr,Fail
-spec@glsl-1.10@execution@loops@glsl-fs-loop-const-incr,Fail
 spec@glsl-1.10@execution@loops@glsl-fs-loop-continue,Fail
 spec@glsl-1.10@execution@loops@glsl-fs-loop-diagonal-break,Fail
 spec@glsl-1.10@execution@loops@glsl-fs-loop-ge,Fail
diff --git a/src/gallium/drivers/i915/i915_fpc_translate.c b/src/gallium/drivers/i915/i915_fpc_translate.c
index 37dcf70786b..60cec033f1c 100644
--- a/src/gallium/drivers/i915/i915_fpc_translate.c
+++ b/src/gallium/drivers/i915/i915_fpc_translate.c
@@ -52,16 +52,7 @@
  */
 static unsigned passthrough_decl[] =
 {
-   _3DSTATE_PIXEL_SHADER_PROGRAM | ((2*3)-1),
-
-   /* declare input color:
-    */
-   (D0_DCL |
-    (REG_TYPE_T << D0_TYPE_SHIFT) |
-    (T_DIFFUSE << D0_NR_SHIFT) |
-    D0_CHANNEL_ALL),
-   0,
-   0,
+   _3DSTATE_PIXEL_SHADER_PROGRAM | ((1*3)-1),
 };
 
 static unsigned passthrough_program[] =
@@ -71,9 +62,12 @@ static unsigned passthrough_program[] =
    (A0_MOV |
     (REG_TYPE_OC << A0_DEST_TYPE_SHIFT) |
     A0_DEST_CHANNEL_ALL |
-    (REG_TYPE_T << A0_SRC0_TYPE_SHIFT) |
-    (T_DIFFUSE << A0_SRC0_NR_SHIFT)),
-   0x01230000,			/* .xyzw */
+    (REG_TYPE_R << A0_SRC0_TYPE_SHIFT) |
+    (0 << A0_SRC0_NR_SHIFT)),
+   ((SRC_ONE << A1_SRC0_CHANNEL_X_SHIFT) |
+    (SRC_ZERO << A1_SRC0_CHANNEL_Y_SHIFT) |
+    (SRC_ZERO << A1_SRC0_CHANNEL_Z_SHIFT) |
+    (SRC_ONE << A1_SRC0_CHANNEL_W_SHIFT)),
    0
 };