diff --git a/bootstrap.conf b/bootstrap.conf
index 1fa0a38389..9964231bb7 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -71,7 +71,6 @@ mgetgroups
 mkdtemp
 mkostemp
 mkostemps
-mktempd
 net_if
 netdb
 nonblocking
diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index ef5a47b565..c19005a371 100644
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -256,8 +256,7 @@ fi
 # a partition, or to undo any other global state changes.
 cleanup_() { :; }
 
-mktempd="$abs_top_srcdir/build-aux/mktempd"
-t_=$("$SHELL" "$mktempd" "$test_dir_" lv-$this_test.XXXXXXXXXX) \
+t_=$("mktemp" "-d" "$test_dir_/lv-$this_test.XXXXXXXXXX") \
     || error_ "failed to create temporary directory in $test_dir_"
 
 # Run each test from within a temporary sub-directory named after the