diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index b4dc0d2fbe..1f59960d90 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -107,9 +107,6 @@ test_expect_success 'remove remote' '
 )
 '
 
-case $(uname -s) in
-*MINGW*) pwd() { builtin pwd -W; } ;;
-esac
 cat > test/expect << EOF
 * remote origin
   URL: $(pwd)/one
diff --git a/t/test-lib.sh b/t/test-lib.sh
index cce3636c1b..7a5f77b765 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -536,5 +536,8 @@ case $(uname -s) in
 	find () {
 		/usr/bin/find "$@"
 	}
+	pwd() {
+		builtin pwd -W
+	}
 	;;
 esac