diff --git a/.github/scripts/tar-artifact.sh b/.github/scripts/tar-artifact.sh
index 2a59d35..8f9b813 100644
--- a/.github/scripts/tar-artifact.sh
+++ b/.github/scripts/tar-artifact.sh
@@ -13,7 +13,6 @@ fi
 
 arch="${1}"
 toolchain="${2}"
-archive_make_helpers="${3:-0}"
 
 # Convert a platform (as returned by uname -m) to the kernel
 # arch (as expected by ARCH= env).
@@ -74,7 +73,7 @@ for file in "${kbuild_output_file_list[@]}"; do
 done
 
 additional_file_list=()
-if [ $archive_make_helpers -ne 0 ]; then
+if [[ -n "${ARCHIVE_MAKE_HELPERS}" ]]; then
   # Package up a bunch of additional infrastructure to support running
   # 'make kernelrelease' and bpf tool checks later on.
   mapfile -t additional_file_list < <(find . -iname Makefile)
@@ -86,9 +85,11 @@ if [ $archive_make_helpers -ne 0 ]; then
   )
 fi
 
-# Make sure sched_ext tests are included in the tarball
 mkdir -p selftests
-mv tools/testing/selftests/sched_ext selftests
+cp -r tools/testing/selftests/bpf selftests
+if [[ -n "${BUILD_SCHED_EXT_SELFTESTS}" ]]; then
+  cp -r tools/testing/selftests/sched_ext selftests
+fi
 
 tar -cf - \
     kbuild-output \
@@ -97,8 +98,7 @@ tar -cf - \
     --exclude '*.d'                    \
     --exclude '*.h'                    \
     --exclude '*.output'               \
-    selftests/bpf/                     \
-    selftests/sched_ext/               \
+    selftests/                         \
   | zstd -T0 -19 -o "vmlinux-${arch}-${toolchain}.tar.zst"
 
 # Cleanup and restore the original KBUILD_OUTPUT
diff --git a/.github/workflows/kernel-build.yml b/.github/workflows/kernel-build.yml
index f743568..05c70b6 100644
--- a/.github/workflows/kernel-build.yml
+++ b/.github/workflows/kernel-build.yml
@@ -142,7 +142,7 @@ jobs:
       - name: Tar artifacts
         working-directory: ${{ env.REPO_ROOT }}
         run: |
-          bash .github/scripts/tar-artifact.sh ${{ inputs.arch }} ${{ inputs.toolchain_full }} ${{ env.ARCHIVE_MAKE_HELPERS }}
+          bash .github/scripts/tar-artifact.sh ${{ inputs.arch }} ${{ inputs.toolchain_full }}
       - if: ${{ github.event_name != 'push' }}
         name: Remove KBUILD_OUTPUT content
         shell: bash
diff --git a/build-scx-selftests/build.sh b/build-scx-selftests/build.sh
index 129bfd5..b495d03 100755
--- a/build-scx-selftests/build.sh
+++ b/build-scx-selftests/build.sh
@@ -27,6 +27,8 @@ MAKE_OPTS=$(cat <<EOF
 	ARCH=${ARCH}
 	CROSS_COMPILE=${CROSS_COMPILE}
 	CLANG=clang-${LLVM_VERSION}
+	LLC=llc-${LLVM_VERSION}
+	LLVM_STRIP=llvm-strip-${LLVM_VERSION}
 	VMLINUX_BTF=${KBUILD_OUTPUT}/vmlinux
 EOF
 )
diff --git a/build-selftests/build_selftests.sh b/build-selftests/build_selftests.sh
index 91eaddc..df4280e 100755
--- a/build-selftests/build_selftests.sh
+++ b/build-selftests/build_selftests.sh
@@ -26,8 +26,6 @@ fi
 
 foldable start build_selftests "Building selftests with $TOOLCHAIN"
 
-LIBBPF_PATH="${REPO_ROOT}"
-
 PREPARE_SELFTESTS_SCRIPT=${THISDIR}/prepare_selftests-${KERNEL}.sh
 if [ -f "${PREPARE_SELFTESTS_SCRIPT}" ]; then
 	(cd "${REPO_ROOT}/${REPO_PATH}/tools/testing/selftests/bpf" && ${PREPARE_SELFTESTS_SCRIPT})
@@ -59,10 +57,4 @@ make ${MAKE_OPTS} headers
 make ${MAKE_OPTS} ${SELF_OPTS} clean
 make ${MAKE_OPTS} ${SELF_OPTS} -j $(kernel_build_make_jobs)
 
-cd -
-mkdir "${LIBBPF_PATH}"/selftests
-cp -R "${REPO_ROOT}/${REPO_PATH}/tools/testing/selftests/bpf" \
-  "${LIBBPF_PATH}"/selftests
-cd "${LIBBPF_PATH}"
-
 foldable end build_selftests