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 c08e59c06f6..2b5321e5e1c 100644
--- a/src/gallium/drivers/i915/ci/deqp-i915-g33-flakes.txt
+++ b/src/gallium/drivers/i915/ci/deqp-i915-g33-flakes.txt
@@ -1,2 +1 @@
-dEQP-GLES2.functional.shaders.discard.function_always
 dEQP-GLES2.functional.shaders.random.texture.*
diff --git a/src/gallium/drivers/i915/ci/piglit-i915-g33-flakes.txt b/src/gallium/drivers/i915/ci/piglit-i915-g33-flakes.txt
deleted file mode 100644
index e76b4b79258..00000000000
--- a/src/gallium/drivers/i915/ci/piglit-i915-g33-flakes.txt
+++ /dev/null
@@ -1 +0,0 @@
-spec@glsl-1.10@execution@discard@glsl-fs-discard-03
diff --git a/src/gallium/drivers/i915/i915_fpc_translate.c b/src/gallium/drivers/i915/i915_fpc_translate.c
index d41a59e0601..f51dfc4a2d7 100644
--- a/src/gallium/drivers/i915/i915_fpc_translate.c
+++ b/src/gallium/drivers/i915/i915_fpc_translate.c
@@ -646,7 +646,7 @@ i915_translate_instruction(struct i915_fp_compile *p,
                       tmp,                                   /* dest reg: a dummy reg */
                       A0_DEST_CHANNEL_ALL,                   /* dest writemask */
                       0,                                     /* sampler */
-                      negate(swizzle(0, ONE, ONE, ONE, ONE), 1, 1, 1, 1), /* coord */
+                      negate(swizzle(UREG(REG_TYPE_R, 0), ONE, ONE, ONE, ONE), 1, 1, 1, 1), /* coord */
                       T0_TEXKILL,                            /* opcode */
                       1);                                    /* num_coord */
       break;