diff --git a/src/gallium/auxiliary/gallivm/lp_bld_limits.h b/src/gallium/auxiliary/gallivm/lp_bld_limits.h
index 4cbe561e99a..573237e23d0 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_limits.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_limits.h
@@ -130,10 +130,11 @@ gallivm_get_shader_param(enum pipe_shader_cap param)
       return 1;
    case PIPE_SHADER_CAP_INTEGERS:
       return 1;
-   case PIPE_SHADER_CAP_INT64_ATOMICS:
    case PIPE_SHADER_CAP_FP16:
    case PIPE_SHADER_CAP_FP16_DERIVATIVES:
    case PIPE_SHADER_CAP_FP16_CONST_BUFFERS:
+      return lp_has_fp16();
+   case PIPE_SHADER_CAP_INT64_ATOMICS:
       return 0;
    case PIPE_SHADER_CAP_INT16:
    case PIPE_SHADER_CAP_GLSL_16BIT_CONSTS:
diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-cl.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-cl.txt
index cbcb4abde89..bd4759050c1 100644
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-cl.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-cl.txt
@@ -15,9 +15,9 @@ program/check predefined preprocessor macros/__opencl_c_version__ must be define
 program/check predefined preprocessor macros/cl_version_1_2 must be defined for opencl 1.2 and later: skip
 program/check predefined preprocessor macros/cl_version_2_0 must be defined for opencl 2.0 and later: skip
 program/execute/amdgcn-callee-saved-registers: skip
-program/execute/amdgcn-f16-inline-immediates: skip
+program/execute/amdgcn-f16-inline-immediates: fail
 program/execute/amdgcn-f32-inline-immediates: fail
-program/execute/amdgcn-i16-inline-immediates: skip
+program/execute/amdgcn-i16-inline-immediates: fail
 program/execute/atomic_int64_add-global: skip
 program/execute/atomic_int64_add-global-return: skip
 program/execute/atomic_int64_add-local: skip
@@ -60,8 +60,6 @@ program/execute/builtin/builtin-float-tan-1.0.generated: timeout
 program/execute/builtin/builtin-int-popcount-1.2.generated: skip
 program/execute/builtin/builtin-long-popcount-1.2.generated: skip
 program/execute/builtin/builtin-short-popcount-1.2.generated: skip
-program/execute/builtin/builtin-shuffle-half-ushort: skip
-program/execute/builtin/builtin-shuffle2-half-ushort: skip
 program/execute/builtin/builtin-uchar-popcount-1.2.generated: skip
 program/execute/builtin/builtin-uint-popcount-1.2.generated: skip
 program/execute/builtin/builtin-ulong-popcount-1.2.generated: skip
@@ -76,14 +74,7 @@ program/execute/image-attributes: crash
 program/execute/image-write-2d: crash
 program/execute/load-hi16-generic: skip
 program/execute/load-lo16-generic: skip
-program/execute/mad-mix: skip
+program/execute/mad-mix: fail
 program/execute/program-tester-check-local-size-test-should-skip/this test should skip: skip
 program/execute/scalar-logical-float: skip
 program/execute/store-hi16-generic: skip
-program/execute/vload/vload-half-constant: skip
-program/execute/vload/vload-half-global: skip
-program/execute/vload/vload-half-local: skip
-program/execute/vload/vload-half-private: skip
-program/execute/vstore/vstore-half-global: skip
-program/execute/vstore/vstore-half-local: skip
-program/execute/vstore/vstore-half-private: skip
diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt
index 4dace0da09e..92549497749 100644
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt
@@ -188,6 +188,7 @@ spec/glsl-4.00/execution/conversion/vert-conversion-explicit-dvec2-vec2: fail
 spec/glsl-4.00/execution/conversion/vert-conversion-explicit-dvec3-vec3: fail
 spec/glsl-4.00/execution/conversion/vert-conversion-explicit-dvec4-vec4: fail
 spec/glsl-4.50/execution/ssbo-atomiccompswap-int: fail
+spec/glsl-es-1.00/linker/glsl-mismatched-uniform-precision-unused: fail
 spec/intel_shader_atomic_float_minmax/execution/shared-atomiccompswap-float: skip
 spec/intel_shader_atomic_float_minmax/execution/shared-atomicexchange-float: skip
 spec/intel_shader_atomic_float_minmax/execution/shared-atomicmax-float: skip
diff --git a/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
index ff9e0a7f834..25920f466d4 100644
--- a/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
+++ b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
@@ -5,11 +5,11 @@ traces:
   - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace
     expectations:
       - device: gl-vmware-llvmpipe
-        checksum: 26080879ac8eb63c2c5da3de5fc732f4
+        checksum: 0f3d505644e0adc6ac947b2e609b8ecf
   - path: glmark2/jellyfish.trace
     expectations:
       - device: gl-vmware-llvmpipe
-        checksum: 91dbe94735a132aeb192ae5c618ddc06
+        checksum: 878c45710869e0d9d585bacdc5b9b8a0
   - path: glxgears/glxgears-2.trace
     expectations:
       - device: gl-vmware-llvmpipe