--- m4/gnulib-comp.m4
+++ m4/gnulib-comp.m4
@@ -105,7 +105,6 @@ AC_DEFUN([M4_INIT],
   gl_PATHMAX
   gl_FUNC_PRINTF_FREXP
   gl_FUNC_PRINTF_FREXPL
-  m4_divert_text([INIT_PREPARE], [gl_printf_safe=yes])
   gl_QUOTEARG
   gl_REGEX
   gl_SIGNAL_H
--- tests/Makefile.am
+++ tests/Makefile.am
@@ -256,13 +256,6 @@ check_PROGRAMS += test-unistd
 
 ## end   gnulib module unistd-tests
 
-## begin gnulib module vasnprintf-tests
-
-TESTS += test-vasnprintf
-check_PROGRAMS += test-vasnprintf
-
-## end   gnulib module vasnprintf-tests
-
 ## begin gnulib module vasprintf-posix-tests
 
 TESTS += test-vasprintf-posix