--- a/libposix/bootstrap
+++ b/libposix/bootstrap
@@ -41,22 +41,6 @@
 	Gary V. Vaughan
 	_EOF_
 
-# We cannot tell which modules will get pulled in via dependencies
-# when gnulib-tool gets run.  Therefore, strip out "error" from all
-# modules that mention it.  Either we won't use the module, or the
-# module will have to be tweaked to remove the dependency for libposix.
-# "GNULIB_LIBPOSIX" is a CPP symbol for libposix.
-#
-set -- `egrep -l '^error$' ../modules/[a-z]*`
-
-for mod
-do
-    test "X$mod" = Xerror && continue
-    echo 'NOTE: removing "error" dependency from' ${mod}
-    d=`basename $mod`
-    sed '/^error$/d' ${mod} > tmp/modules/$d
-done >&2
-
 opts='--local-dir=tmp
 	--import
 	--lib=libposix
@@ -69,8 +53,24 @@
 	--with-c++-tests
 	--with-longrunning-tests'
 
+# We cannot tell which modules will get pulled in via dependencies
+# when gnulib-tool gets run.  Therefore, strip out "error" from all
+# modules that mention it.  Either we won't use the module, or the
+# module will have to be tweaked to remove the dependency for libposix.
+# "GNULIB_LIBPOSIX" is a CPP symbol for libposix.  Also, avoid testing
+# any module that has had its error dependency removed.
+#
+for mod in `egrep -l '^error$' ../modules/[a-z]*`
+do
+    test "X$mod" = Xerror && continue
+    d=`basename $mod`
+    opts="${opts} --avoid=${d}-tests"
+    sed '/^error$/d' ${mod} > tmp/modules/$d
+done >&2
+
 # Bootstrap for autotools.
 #
+echo gnulib-tool ${opts} git-version-gen libposix
 gnulib-tool ${opts} git-version-gen libposix
 
 # No need to maintain a Makefile.am just to include gnulib.mk.