diff --git a/ci/scripts/test.sh b/ci/scripts/test.sh
index 60fff7147008e222e964b24052759556a479e6a5..c88655af7fbb9bba06490fdd8b5cb382881052ca 100755
--- a/ci/scripts/test.sh
+++ b/ci/scripts/test.sh
@@ -79,9 +79,9 @@ echo
 echo "Default testing OpenCL platform is:"
 ${PYTHON_EXECUTABLE} -c 'import hysop; from hysop.testsenv import iter_clenv; print next(iter(iter_clenv()));'
 
-DO_TESTS=${DO_TESTS:-true}
-DO_EXAMPLES=${DO_EXAMPLES:-true}
-DO_LONG_TESTS=${DO_LONG_TESTS:-false}
+RUN_TESTS=${RUN_TESTS:-true}
+RUN_EXAMPLES=${RUN_EXAMPLES:-false}
+RUN_LONG_TESTS=${RUN_LONG_TESTS:-false}
 
 COMMON_TEST_OPTIONS=''
 TEST_DIR="$HYSOP_DIR"
@@ -105,7 +105,7 @@ example_test() {
      echo
 }
 
-if [ "$DO_TESTS" = true ]; then
+if [ "$RUN_TESTS" = true ]; then
     hysop_test "core/arrays/tests/test_array.py"
     hysop_test "core/graph/tests/test_graph.py"
     hysop_test "fields/tests/test_fields.py"
@@ -130,12 +130,12 @@ if [ "$DO_TESTS" = true ]; then
     $HYSOP_DIR/fields/tests/test_cartesian.sh
 fi
 
-if [ "$DO_LONG_TESTS" = true ]; then
+if [ "$RUN_LONG_TESTS" = true ]; then
     hysop_test "backend/device/codegen/kernels/tests/test_directional_advection.py"
     hysop_test "backend/device/codegen/kernels/tests/test_directional_remesh.py"
 fi
 
-if [ "$DO_EXAMPLES" = true ]; then
+if [ "$RUN_EXAMPLES" = true ]; then
     example_test "analytic/analytic.py"
     example_test "scalar_diffusion/scalar_diffusion.py"
     example_test "scalar_advection/scalar_advection.py"
diff --git a/test_ci_docker.sh b/test_ci_docker.sh
deleted file mode 120000
index eb7ab4bbb09c38c38393fa759def7876c5f6b8f8..0000000000000000000000000000000000000000
--- a/test_ci_docker.sh
+++ /dev/null
@@ -1 +0,0 @@
-ci/utils/run_ci.sh
\ No newline at end of file
diff --git a/test_examples.sh b/test_examples.sh
index 5162b3ca651cd71edd44007f353e46ee00b58610..b5dd68b5dfebd75a44210d2a0a264c97266f7a26 100755
--- a/test_examples.sh
+++ b/test_examples.sh
@@ -9,9 +9,9 @@ if [ -z "$HYSOP_ROOT" ]; then
     echo "Setting HYSOP_ROOT to '${HYSOP_ROOT}'"
 fi
 
-export DO_TESTS=false
-export DO_LONG_TESTS=false
-export DO_EXAMPLES=true
+export RUN_TESTS=false
+export RUN_LONG_TESTS=false
+export RUN_EXAMPLES=true
 ${HYSOP_ROOT}/ci/scripts/test.sh ${HYSOP_ROOT} ${HYSOP_ROOT}/hysop
 
 exit 0