diff --git a/configure.in b/configure.in
index d8324ae7..7e81f4d7 100644
--- a/configure.in
+++ b/configure.in
@@ -212,6 +212,8 @@ AC_HEADER_TIME
 dnl Checks for library functions.
 AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getservbyname getprotobynumber setenv unsetenv putenv)
 
+if test "$ac_cv_func_getaddrinfo" != "yes" ; then
+
 # Check for gethostbyname_r in all its glorious incompatible versions.
 #   (This is cut-and-pasted from Tor, which based its logic on
 #   Python's configure.in.)
@@ -268,6 +270,7 @@ AC_CHECK_FUNC(gethostbyname_r, [
  CFLAGS=$OLD_CFLAGS
 ])
 
+fi
 
 AC_CHECK_SIZEOF(long)
 
diff --git a/test/test.sh b/test/test.sh
index 48deb9b1..0054faee 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -7,12 +7,18 @@ then
 	TEST_OUTPUT_FILE=/dev/null
 fi
 
-# /bin/echo is a little more likely to support -n than sh's builtin echo.
-if test -x /bin/echo
+# /bin/echo is a little more likely to support -n than sh's builtin echo,
+# printf is even more likely
+if test "`printf hello 2>&1`" = "hello"
 then
-	ECHO=/bin/echo
+	ECHO_N="printf"
 else
-	ECHO=echo
+	if test -x /bin/echo
+	then
+		ECHO_N="/bin/echo -n"
+	else
+		ECHO_N="echo -n"
+	fi
 fi
 
 if test "$TEST_OUTPUT_FILE" != "/dev/null"
@@ -45,7 +51,7 @@ announce () {
 }
 
 announce_n () {
-	$ECHO -n "$@"
+	$ECHO_N "$@"
 	echo "$@" >>"$TEST_OUTPUT_FILE"
 }