diff --git a/CHANGES b/CHANGES
index 136bf1d0a4..53f28b811b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,22 @@
+7.0.0-dev.458 | 2024-07-10 11:05:19 +0200
+
+  * testing/btest: Default to HILTI_JIT_PARALLELISM=1 (Arne Welzel, Corelight)
+
+    This is a rework of b59bed9d06f2257a6b4f6c6408b8363a277eebac moving
+    HILTI_JIT_PARALLELISM=1 into btest.cfg to make it default applicable to
+    btest -j users (and CI).
+
+    The background for this change is that spicyz may spawn up to nproc compiler
+    instances by default. Combined with btest -j, this may be nproc x nproc
+    instances worst case. Particularly with gcc, this easily overloads CI or
+    local systems, putting them into hard-to-recover-from thrashing/OOM states.
+
+    Exporting HILTI_JIT_PARALLELISM in the shell allows overriding.
+
+  * Revert "CI: Use ccache and a single CPU when building spicy analyzers for btests" (Arne Welzel, Corelight)
+
+    This reverts commit b59bed9d06f2257a6b4f6c6408b8363a277eebac.
+
 7.0.0-dev.454 | 2024-07-09 15:12:19 -0700
 
   * CI: Use ccache and a single CPU when building spicy analyzers for btests (Tim Wojtulewicz, Corelight)
diff --git a/VERSION b/VERSION
index 4660bf74f7..151a1023da 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.0.0-dev.454
+7.0.0-dev.458
diff --git a/ci/test.sh b/ci/test.sh
index e8c56e152a..c5304b4512 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -59,9 +59,7 @@ function run_btests {
 
     pushd testing/btest
 
-    HILTI_CXX_COMPILER_LAUNCHER=ccache \
-        HILTI_JIT_PARALLELISM=1 \
-        ZEEK_PROFILER_FILE=$(pwd)/.tmp/script-coverage/XXXXXX \
+    ZEEK_PROFILER_FILE=$(pwd)/.tmp/script-coverage/XXXXXX \
         ${BTEST} -z ${ZEEK_CI_BTEST_RETRIES} -d -A -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} || result=1
     make coverage
     prep_artifacts
diff --git a/testing/btest/btest.cfg b/testing/btest/btest.cfg
index 5668992b56..b47ff2dddf 100644
--- a/testing/btest/btest.cfg
+++ b/testing/btest/btest.cfg
@@ -14,6 +14,7 @@ MinVersion  = 0.63
 [environment]
 ZEEKPATH=`bash -c %(testbase)s/../../%(build_dir)s/zeek-path-dev`
 HILTI_CXX_COMPILER_LAUNCHER=`f=%(testbase)s/../../%(build_dir)s/CMakeCache.txt && grep -q '^ENABLE_CCACHE:BOOL=true' $f && sed -n 's/^CCACHE_PROGRAM:FILEPATH=\(.*\)$/\1/p' $f`
+HILTI_JIT_PARALLELISM=`bash -c 'echo ${HILTI_JIT_PARALLELISM:-1}'`
 ZEEK_SEED_FILE=%(testbase)s/random.seed
 ZEEK_PLUGIN_PATH=
 TZ=UTC