diff --git a/.jenkins/cscs/Jenkinsfile b/.jenkins/cscs/Jenkinsfile
index 817f2610cfb1..32c63feb7a8c 100644
--- a/.jenkins/cscs/Jenkinsfile
+++ b/.jenkins/cscs/Jenkinsfile
@@ -42,7 +42,7 @@ pipeline {
                     // number of node-hours consumed
                     axis {
                         name 'configuration_name'
-                        values 'gcc-11', 'gcc-cuda', 'clang-10', 'clang-13', 'clang-cuda', 'clang-apex'
+                        values 'gcc-11', 'clang-10', 'clang-13', 'clang-apex'
                     }
                     axis {
                          name 'build_type'
diff --git a/.jenkins/cscs/env-clang-12.sh b/.jenkins/cscs/env-clang-12.sh
deleted file mode 100644
index 402bfed89ab0..000000000000
--- a/.jenkins/cscs/env-clang-12.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (c) 2020 ETH Zurich
-#
-# SPDX-License-Identifier: BSL-1.0
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-export CRAYPE_LINK_TYPE=dynamic
-export APPS_ROOT="/apps/daint/SSL/HPX/packages"
-export CLANG_VER="12.0.0"
-export CXX_STD="20"
-export BOOST_VER="1.77.0"
-export HWLOC_VER="2.2.0"
-export CLANG_ROOT="${APPS_ROOT}/llvm-${CLANG_VER}"
-export BOOST_ROOT="${APPS_ROOT}/boost-${BOOST_VER}-clang-${CLANG_VER}-c++20-release"
-export HWLOC_ROOT="${APPS_ROOT}/hwloc-${HWLOC_VER}-gcc-10.2.0"
-export CXXFLAGS="-Wno-unused-command-line-argument -stdlib=libc++ -nostdinc++ -isystem${CLANG_ROOT}/include/c++/v1 -L${CLANG_ROOT}/lib -Wl,-rpath,${CLANG_ROOT}/lib,-lsupc++"
-export LDCXXFLAGS="-stdlib=libc++ -L${CLANG_ROOT}/lib -Wl,-rpath,${CLANG_ROOT}/lib,-lsupc++"
-export CXX="${CLANG_ROOT}/bin/clang++"
-export CC="${CLANG_ROOT}/bin/clang"
-export CPP="${CLANG_ROOT}/bin/clang -E"
-
-module load daint-mc
-spack load cmake@3.18.6
-spack load ninja@1.10.0
-
-configure_extra_options+=" -DHPX_WITH_MALLOC=system"
-configure_extra_options+=" -DHPX_WITH_FETCH_ASIO=ON"
-configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
-configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON"
-configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON"
-configure_extra_options+=" -DHPX_WITH_DYNAMIC_HPX_MAIN=OFF"
-configure_extra_options+=" -DHPX_WITH_SPINLOCK_DEADLOCK_DETECTION=ON"
-configure_extra_options+=" -DHPX_WITH_UNITY_BUILD=ON"
-
-# enable extra counters to verify everything compiles
-configure_extra_options+=" -DHPX_WITH_PARCELPORT_ACTION_COUNTERS=ON"
-configure_extra_options+=" -DHPX_WITH_THREAD_IDLE_RATES=ON"
-configure_extra_options+=" -DHPX_WITH_THREAD_CREATION_AND_CLEANUP_RATES=ON"
-configure_extra_options+=" -DHPX_WITH_THREAD_CUMULATIVE_COUNTS=ON"
-configure_extra_options+=" -DHPX_WITH_THREAD_QUEUE_WAITTIME=ON"
-configure_extra_options+=" -DHPX_WITH_THREAD_STEALING_COUNTS=ON"
diff --git a/.jenkins/cscs/env-clang-cuda.sh b/.jenkins/cscs/env-clang-cuda.sh
deleted file mode 100644
index ce5150aa40d6..000000000000
--- a/.jenkins/cscs/env-clang-cuda.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) 2020 ETH Zurich
-#
-# SPDX-License-Identifier: BSL-1.0
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-export CRAYPE_LINK_TYPE=dynamic
-export APPS_ROOT="/apps/daint/SSL/HPX/packages"
-export CXX_STD="17"
-export HWLOC_ROOT="${APPS_ROOT}/hwloc-2.0.3-gcc-8.3.0"
-export BOOST_ROOT="${APPS_ROOT}/boost-1.75.0-gcc-10.1.0-c++17-debug/"
-
-module load daint-gpu
-module load cudatoolkit/11.0.2_3.38-8.1__g5b73779
-spack load cmake@3.18.6
-spack load ninja@1.10.0
-
-export CXX=`which CC`
-export CC=`which cc`
-
-configure_extra_options+=" -DHPX_WITH_MAX_CPU_COUNT=64"
-configure_extra_options+=" -DHPX_WITH_CUDA=ON"
-configure_extra_options+=" -DHPX_WITH_MALLOC=system"
-configure_extra_options+=" -DHPX_WITH_FETCH_ASIO=ON"
-configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
-configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON"
-configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON"
-configure_extra_options+=" -DHPX_WITH_SPINLOCK_DEADLOCK_DETECTION=ON"
-configure_extra_options+=" -DCMAKE_CUDA_COMPILER=$(which $CXX)"
-configure_extra_options+=" -DCMAKE_CUDA_ARCHITECTURES=60"
-
-# The build unit test with HPX in Debug and the hello_world project in Debug
-# mode hangs on this configuration Release-Debug, Debug-Release, and
-# Release-Release do not hang.
-configure_extra_options+=" -DHPX_WITH_TESTS_EXTERNAL_BUILD=OFF"
-
-# This is a workaround for a bug in the Cray clang compiler and/or Boost. When
-# compiling in device mode, Boost detects that float128 is available, but
-# compilation later fails with an error message saying float128 is not
-# available for the target.
-#
-# This sets a custom Boost user configuration, which is a concatenation of the
-# clang and nvcc compiler configurations, with the exception that
-# BOOST_HAS_FLOAT128 is unconditionally disabled.
-configure_extra_options+=" \"-DCMAKE_CXX_FLAGS=-I${src_dir}/.jenkins/cscs/ -DBOOST_USER_CONFIG='<boost_user_config_cray_clang.hpp>'\""
-configure_extra_options+=" \"-DCMAKE_CUDA_FLAGS=--cuda-gpu-arch=sm_60 -I${src_dir}/.jenkins/cscs/ -DBOOST_USER_CONFIG='<boost_user_config_cray_clang.hpp>'\""
diff --git a/.jenkins/cscs/env-gcc-10.sh b/.jenkins/cscs/env-gcc-10.sh
deleted file mode 100644
index c1189ca53667..000000000000
--- a/.jenkins/cscs/env-gcc-10.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2020 ETH Zurich
-#
-# SPDX-License-Identifier: BSL-1.0
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-export CRAYPE_LINK_TYPE=dynamic
-export APPS_ROOT="/apps/daint/SSL/HPX/packages"
-export GCC_VER="10.1.0"
-export CXX_STD="17"
-export BOOST_VER="1.75.0"
-export HWLOC_VER="2.2.0"
-export GCC_ROOT="${APPS_ROOT}/gcc-${GCC_VER}"
-export BOOST_ROOT="${APPS_ROOT}/boost-${BOOST_VER}-gcc-${GCC_VER}-c++${CXX_STD}-debug"
-export HWLOC_ROOT="${APPS_ROOT}/hwloc-${HWLOC_VER}-gcc-${GCC_VER}"
-export CXXFLAGS="-nostdinc++ -I${GCC_ROOT}/include/c++/${GCC_VER} -I${GCC_ROOT}/include/c++/${GCC_VER}/x86_64-unknown-linux-gnu -I${GCC_ROOT}/include/c++/${GCC_VER}/x86_64-pc-linux-gnu -L${GCC_ROOT}/lib64 -Wl,-rpath,${GCC_ROOT}/lib64"
-export LDFLAGS="-L${GCC_ROOT}/lib64"
-export CXX=${GCC_ROOT}/bin/g++
-export CC=${GCC_ROOT}/bin/gcc
-
-module load daint-mc
-spack load cmake@3.18.6
-spack load ninja@1.10.0
-
-configure_extra_options+=" -DHPX_WITH_MAX_CPU_COUNT=128"
-configure_extra_options+=" -DHPX_WITH_MALLOC=system"
-configure_extra_options+=" -DHPX_WITH_FETCH_ASIO=ON"
-configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
-configure_extra_options+=" -DHPX_WITH_NETWORKING=OFF"
-configure_extra_options+=" -DHPX_WITH_DISTRIBUTED_RUNTIME=OFF"
-configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON"
-configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON"
-configure_extra_options+=" -DHPX_WITH_SPINLOCK_DEADLOCK_DETECTION=ON"
-
diff --git a/.jenkins/cscs/env-gcc-cuda.sh b/.jenkins/cscs/env-gcc-cuda.sh
deleted file mode 100644
index dd0b0b11f6b0..000000000000
--- a/.jenkins/cscs/env-gcc-cuda.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2020 ETH Zurich
-#
-# SPDX-License-Identifier: BSL-1.0
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-export CRAYPE_LINK_TYPE=dynamic
-export CXX_STD="17"
-
-module load daint-gpu
-module switch PrgEnv-cray PrgEnv-gnu
-module load cudatoolkit
-module load Boost/1.78.0-CrayGNU-21.09
-module load hwloc/2.4.1
-spack load cmake@3.18.6
-spack load ninja@1.10.0
-
-export CXX=`which CC`
-export CC=`which cc`
-
-configure_extra_options+=" -DHPX_WITH_MALLOC=system"
-configure_extra_options+=" -DHPX_WITH_FETCH_ASIO=ON"
-configure_extra_options+=" -DHPX_WITH_CXX_STANDARD=${CXX_STD}"
-configure_extra_options+=" -DHPX_WITH_CUDA=ON"
-configure_extra_options+=" -DHPX_WITH_EXAMPLES_OPENMP=ON"
-configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON"
-configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON"
-configure_extra_options+=" -DHWLOC_ROOT=${EBROOTHWLOC}"
diff --git a/.jenkins/cscs/slurm-constraint-clang-12.sh b/.jenkins/cscs/slurm-constraint-clang-12.sh
deleted file mode 100644
index 1f9f300cc8fd..000000000000
--- a/.jenkins/cscs/slurm-constraint-clang-12.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2020 ETH Zurich
-#
-# SPDX-License-Identifier: BSL-1.0
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-configuration_slurm_constraint="mc"
diff --git a/.jenkins/cscs/slurm-constraint-clang-9.sh b/.jenkins/cscs/slurm-constraint-clang-9.sh
deleted file mode 100644
index 1f9f300cc8fd..000000000000
--- a/.jenkins/cscs/slurm-constraint-clang-9.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2020 ETH Zurich
-#
-# SPDX-License-Identifier: BSL-1.0
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-configuration_slurm_constraint="mc"
diff --git a/.jenkins/cscs/slurm-constraint-clang-cuda.sh b/.jenkins/cscs/slurm-constraint-clang-cuda.sh
deleted file mode 100644
index 87293c78712d..000000000000
--- a/.jenkins/cscs/slurm-constraint-clang-cuda.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2020 ETH Zurich
-#
-# SPDX-License-Identifier: BSL-1.0
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-configuration_slurm_constraint="gpu"
diff --git a/.jenkins/cscs/slurm-constraint-gcc-10.sh b/.jenkins/cscs/slurm-constraint-gcc-10.sh
deleted file mode 100644
index 1f9f300cc8fd..000000000000
--- a/.jenkins/cscs/slurm-constraint-gcc-10.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2020 ETH Zurich
-#
-# SPDX-License-Identifier: BSL-1.0
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-configuration_slurm_constraint="mc"
diff --git a/.jenkins/cscs/slurm-constraint-gcc-8.sh b/.jenkins/cscs/slurm-constraint-gcc-8.sh
deleted file mode 100644
index 1f9f300cc8fd..000000000000
--- a/.jenkins/cscs/slurm-constraint-gcc-8.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2020 ETH Zurich
-#
-# SPDX-License-Identifier: BSL-1.0
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-configuration_slurm_constraint="mc"
diff --git a/.jenkins/cscs/slurm-constraint-gcc-cuda.sh b/.jenkins/cscs/slurm-constraint-gcc-cuda.sh
deleted file mode 100644
index 87293c78712d..000000000000
--- a/.jenkins/cscs/slurm-constraint-gcc-cuda.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2020 ETH Zurich
-#
-# SPDX-License-Identifier: BSL-1.0
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-configuration_slurm_constraint="gpu"
diff --git a/.jenkins/cscs/slurm-constraint-icc.sh b/.jenkins/cscs/slurm-constraint-icc.sh
deleted file mode 100644
index 1f9f300cc8fd..000000000000
--- a/.jenkins/cscs/slurm-constraint-icc.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2020 ETH Zurich
-#
-# SPDX-License-Identifier: BSL-1.0
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-configuration_slurm_constraint="mc"
diff --git a/libs/full/collectives/tests/regressions/barrier_3792.cpp b/libs/full/collectives/tests/regressions/barrier_3792.cpp
index a24dd0509e3d..519a3d081f99 100644
--- a/libs/full/collectives/tests/regressions/barrier_3792.cpp
+++ b/libs/full/collectives/tests/regressions/barrier_3792.cpp
@@ -20,7 +20,7 @@
 #include <vector>
 
 ///////////////////////////////////////////////////////////////////////////////
-void run_barrier_test1(std::vector<size_t> locs)
+void run_barrier_test1(std::vector<size_t> const& locs)
 {
     auto loc_it = std::find(locs.begin(), locs.end(), hpx::get_locality_id());
     if (loc_it == locs.end())
@@ -28,20 +28,20 @@ void run_barrier_test1(std::vector<size_t> locs)
 
     std::size_t barrier_rank = std::distance(locs.begin(), loc_it);
 
-    std::string barrier_name =
-        "/loc_list/barrier" + std::to_string(locs[0]) + std::to_string(locs[1]);
+    std::string barrier_name = "/loc_list/barrier1" + std::to_string(locs[0]) +
+        std::to_string(locs[1]);
     hpx::distributed::barrier b(barrier_name, locs.size(), barrier_rank);
     b.wait();
 }
 
-void run_barrier_test2(std::vector<size_t> locs)
+void run_barrier_test2(std::vector<size_t> const& locs)
 {
     auto loc_it = std::find(locs.begin(), locs.end(), hpx::get_locality_id());
     if (loc_it == locs.end())
         return;
 
-    std::string barrier_name =
-        "/loc_list/barrier" + std::to_string(locs[0]) + std::to_string(locs[1]);
+    std::string barrier_name = "/loc_list/barrier2" + std::to_string(locs[0]) +
+        std::to_string(locs[1]);
     hpx::distributed::barrier b(barrier_name, locs, hpx::get_locality_id());
     b.wait();
 }
@@ -53,12 +53,15 @@ int hpx_main()
     std::vector<size_t> locs_0{0, 1};
     run_barrier_test1(locs_0);
     run_barrier_test2(locs_0);
+
     std::vector<size_t> locs_1{0, 2};
     run_barrier_test1(locs_1);
     run_barrier_test2(locs_1);
+
     std::vector<size_t> locs_2{1, 2};
     run_barrier_test1(locs_2);
     run_barrier_test2(locs_2);
+
     return hpx::finalize();
 }