diff --git a/t/t5501-old-fetch-and-upload.sh b/t/t5501-old-fetch-and-upload.sh
new file mode 100755
index 0000000000..86df785495
--- /dev/null
+++ b/t/t5501-old-fetch-and-upload.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Johannes Schindelin
+#
+
+# Test that the current fetch-pack/upload-pack plays nicely with
+# an old counterpart
+
+cd $(dirname $0) || exit 1
+
+tmp=$(mktemp tmp-XXXX)
+
+retval=0
+
+if [ -z "$1" ]; then
+	list="fetch upload"
+else
+	list="$@"
+fi
+
+for i in $list; do
+	case "$i" in
+	fetch) pgm="old-git-fetch-pack"; replace="$pgm";;
+	upload) pgm="old-git-upload-pack"; replace="git-fetch-pack --exec=$pgm";;
+	both) pgm="old-git-upload-pack"; replace="old-git-fetch-pack --exec=$pgm";;
+	esac
+
+	if which $pgm; then
+		echo "Testing with $pgm"
+		sed -e "s/git-fetch-pack/$replace/g" \
+			-e "s/# old fails/warn/" < t5500-fetch-pack.sh > $tmp
+
+		sh $tmp || retval=$?
+		rm $tmp
+
+		test $retval != 0 && exit $retval
+	else
+		echo "Skipping test for $i, since I cannot find $pgm"
+	fi
+done
+
+exit 0
+