diff --git a/t/test-lib.sh b/t/test-lib.sh
index b378ed2604..f80b55b33a 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1056,6 +1056,12 @@ case $uname_s in
 	test_set_prereq SED_STRIPS_CR
 	test_set_prereq GREP_STRIPS_CR
 	GIT_TEST_CMP="test-tool cmp"
+	if ! type iconv >/dev/null 2>&1
+	then
+		iconv () {
+			test-tool iconv "$@"
+		}
+	fi
 	;;
 *CYGWIN*)
 	test_set_prereq POSIXPERM