diff --git a/ChangeLog b/ChangeLog
index ddd71e47..35201988 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-18  Simon Josefsson  <simon@josefsson.org>
+
+	* tests/Makefile.am (dist_check_SCRIPTS): Make testing ping and
+	traceroute conditioned on ENABLE_ping and ENABLE_traceroute.
+	Reported by Adam Sampson <ats@offog.org>.
+
 2010-05-15  Alfred M. Szmidt  <ams@gnu.org>
 
 	* configure.ac: Bump version number to 1.8.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1d94a5db..f64a066d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,7 +21,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib
 LDADD = -L../libinetutils -linetutils  ../lib/libgnu.a
 
 check_PROGRAMS = localhost
-dist_check_SCRIPTS = ping-localhost.sh traceroute-localhost.sh
+dist_check_SCRIPTS =
+if ENABLE_ping
+dist_check_SCRIPTS += ping-localhost.sh
+endif
+if ENABLE_traceroute
+dist_check_SCRIPTS += traceroute-localhost.sh
+endif
 TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)