diff --git a/build-selftests/build_selftests.sh b/build-selftests/build_selftests.sh
index 9dd6167..91eaddc 100755
--- a/build-selftests/build_selftests.sh
+++ b/build-selftests/build_selftests.sh
@@ -55,8 +55,6 @@ SELF_OPTS=$(cat <<EOF
 	-C ${REPO_ROOT}/${REPO_PATH}/tools/testing/selftests/bpf
 EOF
 )
-export LLVM_CONFIG=llvm-config-${LLVM_VERSION}
-
 make ${MAKE_OPTS} headers
 make ${MAKE_OPTS} ${SELF_OPTS} clean
 make ${MAKE_OPTS} ${SELF_OPTS} -j $(kernel_build_make_jobs)
diff --git a/setup-build-env/install_clang.sh b/setup-build-env/install_clang.sh
index 076613a..c46b529 100755
--- a/setup-build-env/install_clang.sh
+++ b/setup-build-env/install_clang.sh
@@ -22,7 +22,7 @@ while [ $n -lt 5 ]; do
   set +e && \
   wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && \
   sudo apt-get update && \
-  sudo apt-get install -y clang-${LLVM_VERSION} lld-${LLVM_VERSION} llvm-${LLVM_VERSION} llvm-${LLVM_VERSION}-dev && \
+  sudo apt-get install -y clang-${LLVM_VERSION} lld-${LLVM_VERSION} llvm-${LLVM_VERSION} && \
   set -e && \
   break
   n=$(($n + 1))