diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ecb33349..fb7904db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,8 @@ test-kvazaar: &test-template
     - bash .travis-install.bash
     - export PATH="${HOME}/bin:${PATH}"
     - cmake -DUSE_SHARED_LIB=OFF -DCMAKE_INSTALL_PREFIX=./ . || (cat config.log && false)
-    - make install --jobs=8
-    - env CTEST_OUTPUT_ON_FAILURE=1 make test --jobs=8
+    - make install
+    - env CTEST_PARALLEL_LEVEL=8 CTEST_OUTPUT_ON_FAILURE=1 make test
   artifacts:
     paths:
     - bin/uvg266
@@ -41,7 +41,7 @@ test-ubsan:
 test-valgrind:
   <<: *test-template
   variables:
-    KVZ_TEST_VALGRIND: 1
+    UVG_TEST_VALGRIND: 1
 
 # TODO: If someone knows YAML better, there has to be some better way to
 # concatenate stuff into the test-template script than just manually copy
diff --git a/tests/util.sh b/tests/util.sh
index f765209d..91035ca0 100644
--- a/tests/util.sh
+++ b/tests/util.sh
@@ -36,9 +36,9 @@ valgrind_test() {
 
     prepare "${dimensions}" "${frames}" "${format}"
 
-    # If $KVZ_TEST_VALGRIND is defined and equal to "1", run the test with
+    # If $UVG_TEST_VALGRIND is defined and equal to "1", run the test with
     # valgrind. Otherwise, run without valgrind.
-    if [ "${KVZ_TEST_VALGRIND:-0}" = '1' ]; then
+    if [ "${UVG_TEST_VALGRIND:-0}" = '1' ]; then
         valgrind='valgrind --leak-check=full --error-exitcode=1 --'
     else
         valgrind=''