diff --git a/SRC/Makefile.am b/SRC/Makefile.am
index 20292ee..475d2a5 100644
--- a/SRC/Makefile.am
+++ b/SRC/Makefile.am
@@ -13,7 +13,7 @@ SUBDIRS=plugins
 TESTS=test-echoping-local test-echoping-remote 
 MORE_TESTS=test-echoping-proxy test-echoping-icp test-echoping-crypto test-echoping-tos test-echoping-ipv6 test-echoping-idn test-echoping-plugins
 
-test: check
+test: tests
 tests: check
 
 # TODO: raise a warning at install-time when the prefix changes (just
diff --git a/SRC/test-echoping-ipv6 b/SRC/test-echoping-ipv6
index 58863cd..b82738f 100644
--- a/SRC/test-echoping-ipv6
+++ b/SRC/test-echoping-ipv6
@@ -6,11 +6,11 @@ echo ""
 echo "Since this tests tries remote servers, a failure is not always "
 echo " echoping's fault: it may be a network problem."
 
-./echoping -6 -h / -v www.6bone.net
+./echoping -6 -h / -v www.ripe.net
 
-./echoping -6 -h / -v ns3.nic.fr
+./echoping -6 -h / -v www.afnic.fr
 
-./echoping -6 -v -h / "[3ffe:b00:c18:1::10]:80" # RFC 2732
+./echoping -6 -v -R -h / "[2001:4f8:0:2::d]:80" # RFC 2732
 
 # We force the use of IPv6 with -6 because some libc (Solaris) are
 # smart enough to send only the IPv4 adresses to the application if
diff --git a/SRC/test-echoping-proxy b/SRC/test-echoping-proxy
index 680a43d..877c288 100755
--- a/SRC/test-echoping-proxy
+++ b/SRC/test-echoping-proxy
@@ -13,11 +13,11 @@ fi
 
 ./echoping -h http://www.netaktiv.com/ cache:$PROXY_PORT
 
-./echoping -h http://www.freenix.org/ cache:$PROXY_PORT
+./echoping -h http://www.debian.org/ cache:$PROXY_PORT
 
-./echoping -a -h http://www.freenix.org/ cache:$PROXY_PORT
+./echoping -a -h http://www.debian.org/ cache:$PROXY_PORT
 
-./echoping -A -h http://www.freenix.org/ cache:$PROXY_PORT
+./echoping -A -h http://www.debian.org/ cache:$PROXY_PORT