diff --git a/ci/scripts/test.sh b/ci/scripts/test.sh
index 55b7e18fdc97ec99e66f3cdb86a3b0b9b81363a8..9726ca639eae6023588385b45e402f1b721feba3 100755
--- a/ci/scripts/test.sh
+++ b/ci/scripts/test.sh
@@ -116,7 +116,58 @@ example_test() {
 }
 
 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"
+    hysop_test "numerics/tests/test_fft.py"
+    hysop_test "operator/tests/test_analytic.py"
+    hysop_test "operator/tests/test_transpose.py"
+    hysop_test "operator/tests/test_fd_derivative.py"
+    hysop_test "operator/tests/test_absorption.py"
+    hysop_test "operator/tests/test_penalization.py"
+    hysop_test "operator/tests/test_velocity_correction.py"
+    hysop_test "operator/tests/test_restriction_filter.py"
+    hysop_test "operator/tests/test_scales_advection.py"
+    hysop_test "operator/tests/test_bilevel_advection.py"
+    hysop_test "operator/tests/test_directional_advection.py"
+    hysop_test "operator/tests/test_directional_diffusion.py"
+    hysop_test "operator/tests/test_directional_stretching.py"
+    hysop_test "operator/tests/test_custom_symbolic.py"
+    hysop_test "operator/tests/test_spectral_derivative.py"
+    hysop_test "operator/tests/test_spectral_curl.py"
+    hysop_test "operator/tests/test_diffusion.py"
+    hysop_test "operator/tests/test_poisson.py"
+    hysop_test "operator/tests/test_solenoidal_projection.py"
+    hysop_test "operator/tests/test_poisson_curl.py"
+    ${HYSOP_DIR}/fields/tests/test_cartesian.sh
     ${HYSOP_DIR}/core/tests/test_checkpoint.sh
 fi
 
+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 [ "${RUN_EXAMPLES}" = true ]; then
+    example_test "analytic/analytic.py"
+    example_test "scalar_diffusion/scalar_diffusion.py"
+    example_test "scalar_advection/scalar_advection.py"
+    example_test "scalar_advection/levelset.py"
+    example_test "multiresolution/scalar_advection.py"
+    example_test "shear_layer/shear_layer.py"
+    example_test "taylor_green/taylor_green.py" '-impl python'
+    example_test "taylor_green/taylor_green.py" '-impl opencl'
+    example_test "bubble/periodic_bubble.py"
+    example_test "bubble/periodic_bubble_levelset.py"
+    example_test "bubble/periodic_bubble_levelset_penalization.py" #LLVM bug for DP
+    example_test "bubble/periodic_jet_levelset.py"
+    example_test "particles_above_salt/particles_above_salt_periodic.py"
+    example_test "particles_above_salt/particles_above_salt_symmetrized.py"
+fi
+
+if [ "${HAS_CACHE_DIR}" = true ]; then
+    rsync -rtu "${HYSOP_CACHE_DIR}/" "${CACHE_DIR}/"
+    find "${CACHE_DIR}" -name '*.lock' -delete
+fi
+
 exit 0