diff --git a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in
index 3d0ba78..cc01ad9 100644
--- a/gnulib-tests/Makefile.in
+++ b/gnulib-tests/Makefile.in
@@ -188,7 +188,6 @@ TESTS = test-accept$(EXEEXT) test-alignasof$(EXEEXT) \
 	test-strerror_r$(EXEEXT) test-striconv$(EXEEXT) \
 	test-string$(EXEEXT) test-strnlen$(EXEEXT) \
 	test-strstr$(EXEEXT) test-strtoimax$(EXEEXT) \
-	test-strtoll$(EXEEXT) test-strtoull$(EXEEXT) \
 	test-strtoumax$(EXEEXT) test-symlink$(EXEEXT) \
 	test-sys_ioctl$(EXEEXT) test-sys_select$(EXEEXT) \
 	test-sys_socket$(EXEEXT) test-sys_stat$(EXEEXT) \
@@ -284,7 +283,6 @@ check_PROGRAMS = test-accept$(EXEEXT) test-alignasof$(EXEEXT) \
 	test-strerror_r$(EXEEXT) test-striconv$(EXEEXT) \
 	test-string$(EXEEXT) test-strnlen$(EXEEXT) \
 	test-strstr$(EXEEXT) test-strtoimax$(EXEEXT) \
-	test-strtoll$(EXEEXT) test-strtoull$(EXEEXT) \
 	test-strtoumax$(EXEEXT) test-symlink$(EXEEXT) \
 	test-sys_ioctl$(EXEEXT) test-sys_select$(EXEEXT) \
 	test-sys_socket$(EXEEXT) test-sys_stat$(EXEEXT) \
@@ -6381,20 +6379,6 @@ test-strtoimax.log: test-strtoimax$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-strtoll.log: test-strtoll$(EXEEXT)
-	@p='test-strtoll$(EXEEXT)'; \
-	b='test-strtoll'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-strtoull.log: test-strtoull$(EXEEXT)
-	@p='test-strtoull$(EXEEXT)'; \
-	b='test-strtoull'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-strtoumax.log: test-strtoumax$(EXEEXT)
 	@p='test-strtoumax$(EXEEXT)'; \
 	b='test-strtoumax'; \
diff --git a/gnulib-tests/gnulib.mk b/gnulib-tests/gnulib.mk
index 3556ae5..06a70c3 100644
--- a/gnulib-tests/gnulib.mk
+++ b/gnulib-tests/gnulib.mk
@@ -1942,22 +1942,6 @@ EXTRA_DIST += test-strtoimax.c signature.h macros.h
 
 ## end   gnulib module strtoimax-tests
 
-## begin gnulib module strtoll-tests
-
-TESTS += test-strtoll
-check_PROGRAMS += test-strtoll
-EXTRA_DIST += test-strtoll.c signature.h macros.h
-
-## end   gnulib module strtoll-tests
-
-## begin gnulib module strtoull-tests
-
-TESTS += test-strtoull
-check_PROGRAMS += test-strtoull
-EXTRA_DIST += test-strtoull.c signature.h macros.h
-
-## end   gnulib module strtoull-tests
-
 ## begin gnulib module strtoumax-tests
 
 TESTS += test-strtoumax
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9b4422e..c460801 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -192,7 +192,6 @@ TESTS =						\
   word-multi-file				\
   word-multibyte				\
   write-error-msg				\
-  y2038-vs-32-bit				\
   yesno						\
   z-anchor-newline
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 8ae7bb4..a6d6d97 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -2077,7 +2077,6 @@ TESTS = \
   word-multi-file				\
   word-multibyte				\
   write-error-msg				\
-  y2038-vs-32-bit				\
   yesno						\
   z-anchor-newline
 
@@ -3291,13 +3290,6 @@ write-error-msg.log: write-error-msg
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-y2038-vs-32-bit.log: y2038-vs-32-bit
-	@p='y2038-vs-32-bit'; \
-	b='y2038-vs-32-bit'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 yesno.log: yesno
 	@p='yesno'; \
 	b='yesno'; \