diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
deleted file mode 100644
index f91ac03066..0000000000
--- a/.github/workflows/build_test.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-# vi: ts=2 sw=2 et:
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-name: Build test
-on:
-  pull_request:
-    paths:
-      - '**/meson.build'
-      - '.github/workflows/**'
-      - 'meson_options.txt'
-      - 'src/**'
-      - 'test/fuzz/**'
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-22.04
-    concurrency:
-      group: ${{ github.workflow }}-${{ toJSON(matrix.env) }}-${{ github.ref }}
-      cancel-in-progress: true
-    strategy:
-      fail-fast: false
-      matrix:
-        env:
-          - { COMPILER: "gcc",   COMPILER_VERSION: "11", LINKER: "bfd",  CRYPTOLIB: "gcrypt"  }
-          - { COMPILER: "gcc",   COMPILER_VERSION: "13", LINKER: "mold", CRYPTOLIB: "openssl" }
-          - { COMPILER: "clang", COMPILER_VERSION: "14", LINKER: "mold", CRYPTOLIB: "gcrypt"  }
-          - { COMPILER: "clang", COMPILER_VERSION: "15", LINKER: "bfd",  CRYPTOLIB: "openssl" }
-          - { COMPILER: "clang", COMPILER_VERSION: "17", LINKER: "lld",  CRYPTOLIB: "auto"    }
-    env: ${{ matrix.env }}
-    steps:
-      - name: Repository checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - name: Build check
-        run: .github/workflows/build_test.sh
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
deleted file mode 100644
index 3690f74d0d..0000000000
--- a/.github/workflows/mkosi.yml
+++ /dev/null
@@ -1,158 +0,0 @@
----
-# vi: ts=2 sw=2 et:
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# Simple boot tests that build and boot the mkosi images generated by the mkosi config files in mkosi.conf.d/.
-name: mkosi
-
-on:
-  push:
-    branches:
-      - main
-      - v[0-9]+-stable
-    paths:
-      - '**'
-      - '!README*'
-      - '!LICENSE*'
-      - '!LICENSES/**'
-      - '!TODO'
-      - '!docs/**'
-      - '!man/**'
-      - '!catalog/**'
-      - '!shell-completion/**'
-      - '!po/**'
-      - '!.**'
-      - '.github/**'
-
-  pull_request:
-    branches:
-      - main
-      - v[0-9]+-stable
-    paths:
-      - '**'
-      - '!README*'
-      - '!LICENSE*'
-      - '!LICENSES/**'
-      - '!TODO'
-      - '!docs/**'
-      - '!man/**'
-      - '!catalog/**'
-      - '!shell-completion/**'
-      - '!po/**'
-      - '!.**'
-      - '.github/**'
-
-permissions:
-  contents: read
-
-jobs:
-  ci:
-    runs-on: ubuntu-22.04
-    concurrency:
-      group: ${{ github.workflow }}-${{ matrix.distro }}-${{ matrix.release }}-${{ github.ref }}
-      cancel-in-progress: true
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - distro: arch
-            release: rolling
-          - distro: debian
-            release: testing
-          - distro: ubuntu
-            release: jammy
-          - distro: fedora
-            release: "39"
-          - distro: fedora
-            release: rawhide
-          - distro: opensuse
-            release: tumbleweed
-          - distro: centos
-            release: "9"
-          - distro: centos
-            release: "8"
-
-    env:
-      SYSTEMD_LOG_LEVEL: debug
-
-    steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-    - uses: systemd/mkosi@070528fec478fc93af7ec057a5d2fd0045123c99
-
-    - name: Free disk space
-      run: |
-        sudo rm -rf /usr/local
-        sudo rm -rf /opt/hostedtoolcache
-
-    - name: Configure
-      run: |
-        tee mkosi.local.conf <<EOF
-        [Distribution]
-        Distribution=${{ matrix.distro }}
-        Release=${{ matrix.release }}
-
-        [Output]
-        # Build a disk image in CI as this logic is much more prone to breakage.
-        Format=disk
-
-        [Content]
-        Environment=CI_BUILD=1
-                    SLOW_TESTS=true
-
-        [Host]
-        ToolsTree=default
-        ToolsTreeDistribution=fedora
-        QemuVsock=yes
-        # Sometimes we run on a host with /dev/kvm, but it is broken, so explicitly disable it
-        QemuKvm=no
-        Ephemeral=yes
-        EOF
-
-        # These should override the options from mkosi.conf so we put them in a dropin that's ordered later
-        # instead.
-        tee mkosi.conf.d/99-ci.conf <<EOF
-        [Host]
-        KernelCommandLineExtra=systemd.unit=mkosi-check-and-shutdown.service
-                               systemd.journald.max_level_console=debug
-                               # udev's debug log output is very verbose, so up it to info in CI.
-                               udev.log_level=info
-                               # Root device can take a long time to appear, so let's bump the timeout.
-                               systemd.default_device_timeout_sec=180
-        EOF
-
-        # For erofs, we have to install linux-modules-extra-azure, but that doesn't match the running kernel
-        # version, so we can't load the erofs module. squashfs is a builtin module so we use that instead.
-
-        mkdir -p mkosi.images/system/mkosi.repart/10-usr.conf.d
-        tee mkosi.images/system/mkosi.repart/10-usr.conf.d/squashfs.conf <<EOF
-        [Partition]
-        Format=squashfs
-        EOF
-
-        # The emergency shell is not useful in the CI, as it just blocks for a long time before the job
-        # eventually times out. Override it to just shutdown immediately.
-        mkdir -p mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/
-        mkdir -p mkosi.images/system/mkosi.extra/usr/lib/systemd/system/emergency.service.d/
-        tee mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf <<EOF
-        [Unit]
-        FailureAction=exit
-        [Service]
-        ExecStartPre=
-        ExecStart=
-        ExecStart=false
-        EOF
-        cp mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf mkosi.images/system/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf
-
-    - name: Generate secure boot key
-      run: mkosi --debug genkey
-
-    - name: Show image summary
-      run: mkosi summary
-
-    - name: Build
-      run: mkosi --debug
-
-    - name: Boot systemd-nspawn
-      run: test "$(sudo mkosi --debug boot 1>&2; echo $?)" -eq 123
-
-    - name: Boot QEMU
-      run: timeout -k 30 10m test "$(mkosi --debug qemu 1>&2; echo $?)" -eq 123
diff --git a/.github/workflows/unit_tests.sh b/.github/workflows/unit_tests.sh
index c1a5ede383..373f151c78 100755
--- a/.github/workflows/unit_tests.sh
+++ b/.github/workflows/unit_tests.sh
@@ -74,7 +74,8 @@ for phase in "${PHASES[@]}"; do
             run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true "${MESON_ARGS[@]}" build
             ninja -C build -v
             # Ensure setting a timezone (like the reproducible build tests do) does not break time/date unit tests
-            TZ=GMT+12 meson test -C build --print-errorlogs
+            chmod -R o+rX /home
+            TZ=GMT+12 meson test -C build -v test-execute
             ;;
         RUN_ASAN_UBSAN|RUN_GCC_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN_NO_DEPS)
             MESON_ARGS=(--optimization=1)
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index d2164cc576..ffa4088bb1 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        run_phase: [GCC, GCC_ASAN_UBSAN, CLANG, CLANG_RELEASE, CLANG_ASAN_UBSAN, CLANG_ASAN_UBSAN_NO_DEPS]
+        run_phase: [GCC] #GCC_ASAN_UBSAN, CLANG]
         cryptolib: [auto]
         include:
           - run_phase: GCC
@@ -43,3 +43,6 @@ jobs:
         run: sudo --preserve-env=CRYPTOLIB,GITHUB_ACTIONS,CI .github/workflows/unit_tests.sh RUN_${{ matrix.run_phase }}
         env:
           CRYPTOLIB: ${{ matrix.cryptolib }}
+      - name: Setup tmate session
+        if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3
diff --git a/src/basic/build-path.c b/src/basic/build-path.c
index 8ddef7b2dd..aff6a6d2f3 100644
--- a/src/basic/build-path.c
+++ b/src/basic/build-path.c
@@ -258,7 +258,9 @@ int pin_callout_binary(const char *path) {
 
         _cleanup_free_ char *np = NULL;
         if (find_build_dir_binary(fn, &np) >= 0) {
+                log_warning("%s: build dir binary: %s", __func__, np);
                 r = RET_NERRNO(open(np, O_CLOEXEC|O_PATH));
+                log_warning("%s: open(%s)=%d", __func__, np, r);
                 if (r >= 0)
                         return r;
         }