diff --git a/ci/previous_results/es_host/deqp_results.txt b/ci/previous_results/es_host/deqp_results.txt
index f1ef01f..393abb7 100644
--- a/ci/previous_results/es_host/deqp_results.txt
+++ b/ci/previous_results/es_host/deqp_results.txt
@@ -22464,10 +22464,6 @@ dEQP-GLES3.functional.negative_api.shader.link_program Pass
 dEQP-GLES3.functional.negative_api.shader.pause_transform_feedback Pass
 dEQP-GLES3.functional.negative_api.shader.program_binary Pass
 dEQP-GLES3.functional.negative_api.shader.resume_transform_feedback Pass
-dEQP-GLES3.functional.negative_api.shader.sampler_parameterfv Pass
-dEQP-GLES3.functional.negative_api.shader.sampler_parameterf Pass
-dEQP-GLES3.functional.negative_api.shader.sampler_parameteriv Pass
-dEQP-GLES3.functional.negative_api.shader.sampler_parameteri Pass
 dEQP-GLES3.functional.negative_api.shader.shader_binary Pass
 dEQP-GLES3.functional.negative_api.shader.shader_source Pass
 dEQP-GLES3.functional.negative_api.shader.transform_feedback_varyings Pass
@@ -22530,7 +22526,6 @@ dEQP-GLES3.functional.negative_api.state.get_shader_precision_format Pass
 dEQP-GLES3.functional.negative_api.state.get_shader_source Pass
 dEQP-GLES3.functional.negative_api.state.get_stringi Pass
 dEQP-GLES3.functional.negative_api.state.get_string Pass
-dEQP-GLES3.functional.negative_api.state.get_synciv Pass
 dEQP-GLES3.functional.negative_api.state.get_tex_parameterfv Pass
 dEQP-GLES3.functional.negative_api.state.get_tex_parameteriv Pass
 dEQP-GLES3.functional.negative_api.state.get_uniformfv Pass
@@ -68013,18 +68008,10 @@ dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.program_paramete
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.resume_transform_feedback Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.sampler_parameterIiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.sampler_parameterIuiv NotSupported
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.sampler_parameterfv Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.sampler_parameterf Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.sampler_parameteriv Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.sampler_parameteri Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.shader_binary Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.shader_source Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.srgb_decode_samplerparameterIiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.srgb_decode_samplerparameterIuiv NotSupported
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.srgb_decode_samplerparameterfv Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.srgb_decode_samplerparameterf Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.srgb_decode_samplerparameteriv Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.srgb_decode_samplerparameteri Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.transform_feedback_varyings Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.uniformfv_incompatible_type Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.uniformfv_invalid_count Pass
@@ -68201,7 +68188,6 @@ dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_shader_precis
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_shader_source Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_stringi Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_string Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_synciv Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_tex_parameterfv Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_tex_parameteriiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_tex_parameteriuiv NotSupported
@@ -68511,18 +68497,10 @@ dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.program_paramete
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.resume_transform_feedback Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.sampler_parameterIiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.sampler_parameterIuiv NotSupported
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.sampler_parameterfv Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.sampler_parameterf Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.sampler_parameteriv Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.sampler_parameteri Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.shader_binary Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.shader_source Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameterIiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameterIuiv NotSupported
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameterfv Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameterf Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameteriv Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameteri Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.transform_feedback_varyings Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.uniformfv_incompatible_type Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.uniformfv_invalid_count Pass
@@ -68698,7 +68676,6 @@ dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_shader_precis
 dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_shader_source Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_stringi Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_string Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_synciv Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_tex_parameterfv Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_tex_parameteriiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_tex_parameteriuiv NotSupported
@@ -69007,18 +68984,10 @@ dEQP-GLES31.functional.debug.negative_coverage.log.shader.program_parameteri Pas
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.resume_transform_feedback Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.sampler_parameterIiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.sampler_parameterIuiv NotSupported
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.sampler_parameterfv Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.sampler_parameterf Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.sampler_parameteriv Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.sampler_parameteri Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.shader_binary Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.shader_source Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.srgb_decode_samplerparameterIiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.srgb_decode_samplerparameterIuiv NotSupported
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.srgb_decode_samplerparameterfv Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.srgb_decode_samplerparameterf Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.srgb_decode_samplerparameteriv Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.srgb_decode_samplerparameteri Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.transform_feedback_varyings Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.uniformfv_incompatible_type Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.uniformfv_invalid_count Pass
@@ -69195,7 +69164,6 @@ dEQP-GLES31.functional.debug.negative_coverage.log.state.get_shader_precision_fo
 dEQP-GLES31.functional.debug.negative_coverage.log.state.get_shader_source Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.state.get_stringi Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.state.get_string Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.state.get_synciv Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.state.get_tex_parameterfv Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.state.get_tex_parameteriiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.log.state.get_tex_parameteriuiv NotSupported
diff --git a/ci/previous_results/gl_host/deqp_results.txt b/ci/previous_results/gl_host/deqp_results.txt
index 249eaa3..4236645 100644
--- a/ci/previous_results/gl_host/deqp_results.txt
+++ b/ci/previous_results/gl_host/deqp_results.txt
@@ -22464,10 +22464,6 @@ dEQP-GLES3.functional.negative_api.shader.link_program Pass
 dEQP-GLES3.functional.negative_api.shader.pause_transform_feedback Pass
 dEQP-GLES3.functional.negative_api.shader.program_binary Pass
 dEQP-GLES3.functional.negative_api.shader.resume_transform_feedback Pass
-dEQP-GLES3.functional.negative_api.shader.sampler_parameterfv Pass
-dEQP-GLES3.functional.negative_api.shader.sampler_parameterf Pass
-dEQP-GLES3.functional.negative_api.shader.sampler_parameteriv Pass
-dEQP-GLES3.functional.negative_api.shader.sampler_parameteri Pass
 dEQP-GLES3.functional.negative_api.shader.shader_binary Pass
 dEQP-GLES3.functional.negative_api.shader.shader_source Pass
 dEQP-GLES3.functional.negative_api.shader.transform_feedback_varyings Pass
@@ -22530,7 +22526,6 @@ dEQP-GLES3.functional.negative_api.state.get_shader_precision_format Pass
 dEQP-GLES3.functional.negative_api.state.get_shader_source Pass
 dEQP-GLES3.functional.negative_api.state.get_stringi Pass
 dEQP-GLES3.functional.negative_api.state.get_string Pass
-dEQP-GLES3.functional.negative_api.state.get_synciv Pass
 dEQP-GLES3.functional.negative_api.state.get_tex_parameterfv Pass
 dEQP-GLES3.functional.negative_api.state.get_tex_parameteriv Pass
 dEQP-GLES3.functional.negative_api.state.get_uniformfv Pass
@@ -68013,18 +68008,10 @@ dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.program_paramete
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.resume_transform_feedback Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.sampler_parameterIiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.sampler_parameterIuiv NotSupported
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.sampler_parameterfv Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.sampler_parameterf Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.sampler_parameteriv Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.sampler_parameteri Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.shader_binary Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.shader_source Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.srgb_decode_samplerparameterIiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.srgb_decode_samplerparameterIuiv NotSupported
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.srgb_decode_samplerparameterfv Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.srgb_decode_samplerparameterf Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.srgb_decode_samplerparameteriv Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.srgb_decode_samplerparameteri Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.transform_feedback_varyings Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.uniformfv_incompatible_type Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.uniformfv_invalid_count Pass
@@ -68201,7 +68188,6 @@ dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_shader_precis
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_shader_source Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_stringi Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_string Pass
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_synciv Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_tex_parameterfv Pass
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_tex_parameteriiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.state.get_tex_parameteriuiv NotSupported
@@ -68511,18 +68497,10 @@ dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.program_paramete
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.resume_transform_feedback Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.sampler_parameterIiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.sampler_parameterIuiv NotSupported
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.sampler_parameterfv Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.sampler_parameterf Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.sampler_parameteriv Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.sampler_parameteri Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.shader_binary Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.shader_source Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameterIiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameterIuiv NotSupported
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameterfv Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameterf Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameteriv Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.srgb_decode_samplerparameteri Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.transform_feedback_varyings Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.uniformfv_incompatible_type Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.uniformfv_invalid_count Pass
@@ -68698,7 +68676,6 @@ dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_shader_precis
 dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_shader_source Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_stringi Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_string Pass
-dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_synciv Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_tex_parameterfv Pass
 dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_tex_parameteriiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.get_error.state.get_tex_parameteriuiv NotSupported
@@ -69007,18 +68984,10 @@ dEQP-GLES31.functional.debug.negative_coverage.log.shader.program_parameteri Pas
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.resume_transform_feedback Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.sampler_parameterIiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.sampler_parameterIuiv NotSupported
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.sampler_parameterfv Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.sampler_parameterf Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.sampler_parameteriv Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.sampler_parameteri Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.shader_binary Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.shader_source Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.srgb_decode_samplerparameterIiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.srgb_decode_samplerparameterIuiv NotSupported
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.srgb_decode_samplerparameterfv Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.srgb_decode_samplerparameterf Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.srgb_decode_samplerparameteriv Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.shader.srgb_decode_samplerparameteri Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.transform_feedback_varyings Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.uniformfv_incompatible_type Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.shader.uniformfv_invalid_count Pass
@@ -69195,7 +69164,6 @@ dEQP-GLES31.functional.debug.negative_coverage.log.state.get_shader_precision_fo
 dEQP-GLES31.functional.debug.negative_coverage.log.state.get_shader_source Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.state.get_stringi Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.state.get_string Pass
-dEQP-GLES31.functional.debug.negative_coverage.log.state.get_synciv Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.state.get_tex_parameterfv Pass
 dEQP-GLES31.functional.debug.negative_coverage.log.state.get_tex_parameteriiv NotSupported
 dEQP-GLES31.functional.debug.negative_coverage.log.state.get_tex_parameteriuiv NotSupported
diff --git a/ci/run-deqp.sh b/ci/run-deqp.sh
index e44294f..b1de91c 100755
--- a/ci/run-deqp.sh
+++ b/ci/run-deqp.sh
@@ -70,15 +70,14 @@ if [[ -n "$WITH_VTEST" ]]; then
    export GALLIUM_DRIVER=virpipe
 fi
 
-NUM_JOBS=$(nproc)
 if [[ "x$ONLY_SOFTPIPE_PASS"="xyes" ]] ; then
-    time deqp --threads=$NUM_JOBS \
+    time deqp --threads=$NUM_THREADS \
      --cts-build-dir=/usr/local/VK-GL-CTS/ \
      --test-names-file=/virglrenderer/ci/softpipe-gles-pass.txt \
      --print-failing \
      --results-file=$RESULTS_DIR/deqp_results.txt
 else
-    time deqp --threads=$NUM_JOBS \
+    time deqp --threads=$NUM_THREADS \
      --cts-build-dir=/usr/local/VK-GL-CTS/ \
      --test-names-file=/virglrenderer/ci/deqp-gles2-list.txt \
      --test-names-file=/virglrenderer/ci/deqp-gles3-list.txt \
diff --git a/ci/run-tests.sh b/ci/run-tests.sh
index d8810b2..e404304 100755
--- a/ci/run-tests.sh
+++ b/ci/run-tests.sh
@@ -4,6 +4,12 @@ set -x
 
 #DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends ninja-build meson
 
+# Let .gitlab-ci or local ci runner set
+# desired thread count
+NUM_THREADS=${NUM_THREADS:-"$(nproc)"}
+export NUM_THREADS
+echo "Using $NUM_THREADS threads"
+
 # To prevent hitting assertions such as the below:
 # sb/sb_sched.cpp:1207:schedule_alu: Assertion `!"unscheduled pending instructions"' failed.
 export R600_DEBUG=nosb
@@ -29,7 +35,7 @@ if [[ $LOCAL_MESA ]]; then
    mkdir -p build  && \
    meson build/ && \
    meson configure build/ -Dprefix=/usr/local -Dplatforms=drm,x11,wayland,surfaceless -Ddri-drivers=i965 -Dgallium-drivers=swrast,virgl,radeonsi,r600 -Dbuildtype=debugoptimized -Dllvm=true -Dglx=dri -Dgallium-vdpau=false -Dgallium-va=false -Dvulkan-drivers=[] -Dlibdir=lib && \
-   ninja -C build/ install
+   ninja -C build/ install -j $NUM_THREADS
    if [ $? -ne 0 ]; then
       exit 1
    fi
@@ -46,7 +52,7 @@ if [ $? -ne 0 ]; then
 fi
 mkdir -p /virglrenderer/results/make_check
 cp tests/test*.log /virglrenderer/results/make_check/
-make -j$(nproc) install
+make -j$NUM_THREADS install
 
 
 # Stop testing process if a failure have been found
@@ -57,7 +63,7 @@ fi
 : '
 cd /VK-GL-CTS/build
 #cmake -DDEQP_TARGET=x11_egl -DCMAKE_BUILD_TYPE=Release ..
-make -j$(nproc)
+make -j$NUM_THREADS
 cp -rf * /usr/local/VK-GL-CTS/.
 '
 
diff --git a/ci/run_ci_locally.sh b/ci/run_ci_locally.sh
index 96b51a8..c115b43 100755
--- a/ci/run_ci_locally.sh
+++ b/ci/run_ci_locally.sh
@@ -5,19 +5,24 @@ PROJECT_PATH="$(dirname $(readlink -f "$0"))/.."
 cd ${PROJECT_PATH}
 
 DOCKER_DRIVER=overlay2
-RENDER_DEVICE=/dev/dri/renderD128
 DOCKER_IMAGE=virglrenderer/ci
 
+# Use slightly less than half of available threads
+NUM_THREADS=$(expr $(expr $(nproc) + 2) / 3)
+RENDER_DEVICE=/dev/dri/renderD128
+
 LOCAL_MESA_PATH="../$PROJECT_PATH/mesa"
 LOCAL_VIRGL_PATH="${PROJECT_PATH}"
 
+if test $NUM_THREADS -gt 0; then THREAD_CONFIG="-e NUM_THREADS=$NUM_THREADS"; fi
+if test -e $RENDER_DEVICE; then RD_CONFIG="--device=$RENDER_DEVICE -e RENDER_DEVICE=$RENDER_DEVICE"; fi
 if test -e $LOCAL_MESA_PATH; then LOCAL_MESA="-v $LOCAL_MESA_PATH:/local_mesa -e LOCAL_MESA=/local_mesa"; fi
 if test -e $LOCAL_VIRGL_PATH; then LOCAL_VIRGL="-v $LOCAL_VIRGL_PATH:/virglrenderer -e LOCAL_VIRGL=/virglrenderer"; fi
 
-if test -e $RENDER_DEVICE; then RD_CONFIG="--device=$RENDER_DEVICE -e RENDER_DEVICE=$RENDER_DEVICE"; fi
+echo THREAD_CONFIG=$THREAD_CONFIG
+echo RD_CONFIG=$RD_CONFIG
 echo LOCAL_MESA=$LOCAL_MESA
 echo LOCAL_VIRGL=$LOCAL_VIRGL
-echo RD_CONFIG=$RD_CONFIG
 
 rm -rf $PROJECT_PATH/results
 mkdir -p $PROJECT_PATH/results
@@ -27,6 +32,7 @@ time docker build -t $DOCKER_IMAGE -f ci/Dockerfile --cache-from $DOCKER_IMAGE:l
 time docker run \
      -it \
      --ulimit core=99999999999:99999999999 \
+     $THREAD_CONFIG \
      $RD_CONFIG \
      $LOCAL_MESA \
      $LOCAL_VIRGL \