diff --git a/bootstrap b/bootstrap
index 0f14038d2..aa3c5dc27 100755
--- a/bootstrap
+++ b/bootstrap
@@ -78,7 +78,7 @@ sed '
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit
 
-(cd daemon && $GNULIB_SRCDIR/../gnulib-tool --update)
+(cd daemon && mkdir -p tests lib && $GNULIB_SRCDIR/../gnulib-tool --update)
 
 modules='
 gitlog-to-changelog