diff --git a/ci/cscs_daint_spack_psmp.yaml b/ci/cscs_daint_spack_psmp.yaml
index 878eaa1931..dde7f52756 100644
--- a/ci/cscs_daint_spack_psmp.yaml
+++ b/ci/cscs_daint_spack_psmp.yaml
@@ -80,6 +80,8 @@ regression test cp2k daint:
   stage: test
   needs: ["build cp2k daint","test cp2k daint"]
   timeout: 1h
+  before_script:
+    - export CP2K_DATA_DIR=/opt/cp2k/share/cp2k/data
   script:
     - git --no-pager log -1 --pretty="%nCommitSHA:%x20%H%nCommitTime:%x20%ci%nCommitAuthor:%x20%an%nCommitSubject:%x20%s%n"
     - podman run --shm-size=1g -v ${PWD}:/mnt ${DOCKERHUB_IMAGE_NAME} /opt/cp2k/tests/do_regtest.py --maxtasks ${SLURM_NTASKS} --mpiexec "mpiexec -bind-to none" --keepalive /opt/cp2k/bin ${VERSION} 2>&1 || true
diff --git a/ci/cscs_eiger_spack_psmp.yaml b/ci/cscs_eiger_spack_psmp.yaml
index bf86b2f8fd..7b3cc4074b 100644
--- a/ci/cscs_eiger_spack_psmp.yaml
+++ b/ci/cscs_eiger_spack_psmp.yaml
@@ -81,6 +81,8 @@ regression test cp2k eiger:
   stage: test
   needs: ["build cp2k eiger","test cp2k eiger"]
   timeout: 1h
+  before_script:
+    - export CP2K_DATA_DIR=/opt/cp2k/share/cp2k/data
   script:
     - git --no-pager log -1 --pretty="%nCommitSHA:%x20%H%nCommitTime:%x20%ci%nCommitAuthor:%x20%an%nCommitSubject:%x20%s%n"
     - podman run --shm-size=1g -v ${PWD}:/mnt ${DOCKERHUB_IMAGE_NAME} /opt/cp2k/tests/do_regtest.py --maxtasks ${SLURM_NTASKS} --mpiexec "mpiexec -bind-to none" --keepalive /opt/cp2k/bin ${VERSION} 2>&1 || true
diff --git a/ci/cscs_eiger_spack_ssmp.yaml b/ci/cscs_eiger_spack_ssmp.yaml
index 861bfa04b0..54b349e044 100644
--- a/ci/cscs_eiger_spack_ssmp.yaml
+++ b/ci/cscs_eiger_spack_ssmp.yaml
@@ -79,6 +79,8 @@ regression test cp2k eiger:
   stage: test
   needs: ["build cp2k eiger","test cp2k eiger"]
   timeout: 1h
+  before_script:
+    - export CP2K_DATA_DIR=/opt/cp2k/share/cp2k/data
   script:
     - git --no-pager log -1 --pretty="%nCommitSHA:%x20%H%nCommitTime:%x20%ci%nCommitAuthor:%x20%an%nCommitSubject:%x20%s%n"
     - podman run --shm-size=1g -v ${PWD}:/mnt ${DOCKERHUB_IMAGE_NAME} /opt/cp2k/tests/do_regtest.py --maxtasks ${SLURM_NTASKS} --mpiexec "mpiexec -bind-to none" --keepalive /opt/cp2k/bin ${VERSION} 2>&1 || true
diff --git a/tests/do_regtest.py b/tests/do_regtest.py
index a2ea9f551d..b9fb57b937 100755
--- a/tests/do_regtest.py
+++ b/tests/do_regtest.py
@@ -80,6 +80,7 @@ async def main() -> None:
     parser.add_argument("--restrictdir", action="append")
     parser.add_argument("--skipdir", action="append")
     parser.add_argument("--workbasedir", type=Path)
+    parser.add_argument("--cp2kdatadir", type=Path)
     parser.add_argument("--skip_unittests", action="store_true")
     parser.add_argument("--skip_regtests", action="store_true")
     parser.add_argument("binary_dir", type=Path)
@@ -113,6 +114,7 @@ async def main() -> None:
     print(f"Flag slow:      {cfg.flag_slow}")
     print(f"Debug:          {cfg.debug}")
     print(f"Binary dir:     {cfg.binary_dir}")
+    print(f"CP2K data dir:  {cfg.cp2k_data_dir}")
     print(f"VERSION:        {cfg.version}")
     print(f"Flags:          " + ",".join(flags))
 
@@ -280,6 +282,10 @@ class Config:
         leaf_dir = f"TEST-{datestamp}"
         self.work_base_dir = (args.workbasedir or args.binary_dir).resolve() / leaf_dir
         self.error_summary = self.work_base_dir / "error_summary"
+        self.cp2k_data_dir = (
+            args.cp2kdatadir
+            or Path(os.getenv("CP2K_DATA_DIR", str(self.cp2k_root / "data")))
+        ).resolve()
 
         # Parse suppression files.
         slow_supps_fn = self.cp2k_root / "tests" / "SLOW_TESTS_SUPPRESSIONS"
@@ -314,7 +320,7 @@ class Config:
             env["CUDA_VISIBLE_DEVICES"] = ",".join(visible_gpu_devices)
             env["HIP_VISIBLE_DEVICES"] = ",".join(visible_gpu_devices)
         env["OMP_NUM_THREADS"] = str(self.ompthreads)
-        env["CP2K_DATA_DIR"] = str(self.cp2k_root / "data")
+        env["CP2K_DATA_DIR"] = str(self.cp2k_data_dir)
         env["PIKA_COMMANDLINE_OPTIONS"] = (
             f"--pika:bind=none --pika:threads={self.ompthreads}"
         )
diff --git a/tools/spack/cp2k_deps_psmp.yaml b/tools/spack/cp2k_deps_psmp.yaml
index eb8f631dfa..f4900b2906 100644
--- a/tools/spack/cp2k_deps_psmp.yaml
+++ b/tools/spack/cp2k_deps_psmp.yaml
@@ -99,7 +99,6 @@ spack:
         - +fortran
     tblite:
       require:
-        - +openmp
         - build_system=cmake
     trexio:
       require: