diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 41a36bb1a3..5ac0a273a9 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -108,7 +108,7 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' '
 		mkdir git-dir-wt-1.git &&
 		GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-1.git git init
 	) &&
-	check_config git-dir-wt-1.git false "$(pwd -W)"
+	check_config git-dir-wt-1.git false "$(pwd)"
 '
 
 test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '
diff --git a/t/t1003-read-tree-prefix.sh b/t/t1003-read-tree-prefix.sh
index c59ce72d94..8c6d67edda 100755
--- a/t/t1003-read-tree-prefix.sh
+++ b/t/t1003-read-tree-prefix.sh
@@ -8,10 +8,6 @@ test_description='git read-tree --prefix test.
 
 . ./test-lib.sh
 
-cmp () {
-	diff -w "$@"
-}
-
 test_expect_success setup '
 	echo hello >one &&
 	git update-index --add one &&
diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
index 1f8743bfa6..2298ece801 100755
--- a/t/t4116-apply-reverse.sh
+++ b/t/t4116-apply-reverse.sh
@@ -42,8 +42,7 @@ test_expect_success 'apply in reverse' '
 	git reset --hard second &&
 	git apply --reverse --binary --index patch &&
 	git diff >diff &&
-	: > empty &&
-	test_cmp empty diff
+	test_cmp /dev/null diff
 
 '
 
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 56b37ea432..5ec668d6d8 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -107,10 +107,6 @@ test_expect_success 'remove remote' '
 )
 '
 
-case $(uname -s) in
-*MINGW*) pwd() { builtin pwd -W; } ;;
-esac
-
 test_expect_success 'remove remote protects non-remote branches' '
 (
 	cd test &&
diff --git a/t/t5511-refspec.sh b/t/t5511-refspec.sh
index 0d27a28491..22ba380034 100755
--- a/t/t5511-refspec.sh
+++ b/t/t5511-refspec.sh
@@ -4,8 +4,6 @@ test_description='refspec parsing'
 
 . ./test-lib.sh
 
-test_expect=test_expect_success
-
 test_refspec () {
 
 	kind=$1 refspec=$2 expect=$3
@@ -21,7 +19,7 @@ test_refspec () {
 		title="$kind $refspec (invalid)"
 		test='test_must_fail git ls-remote frotz'
 	fi
-	$test_expect "$title" "$test"
+	test_expect_success "$title" "$test"
 }
 
 test_refspec push ''						invalid
@@ -51,14 +49,7 @@ test_refspec fetch 'refs/heads/*:refs/remotes/frotz/*'
 test_refspec fetch 'refs/heads/*:refs/remotes/frotz'		invalid
 test_refspec fetch 'refs/heads:refs/remotes/frotz/*'		invalid
 test_refspec fetch 'refs/heads/master:refs/remotes/frotz/xyzzy'
-
-case $(uname -s) in
-*MINGW*) test_expect=test_expect_failure;;
-*)       test_expect=test_expect_success;;
-esac
 test_refspec fetch 'refs/heads/master::refs/remotes/frotz/xyzzy'	invalid
-test_expect=test_expect_success
-
 test_refspec fetch 'refs/heads/maste :refs/remotes/frotz/xyzzy'	invalid
 
 test_refspec push 'master~1:refs/remotes/frotz/backup'
@@ -81,16 +72,4 @@ test_refspec fetch ':refs/remotes/frotz/HEAD-to-me'
 test_refspec push ':refs/remotes/frotz/delete me'		invalid
 test_refspec fetch ':refs/remotes/frotz/HEAD to me'		invalid
 
-test_refspec fetch 'refs/heads/*/for-linus:refs/remotes/mine/*-blah' invalid
-test_refspec push 'refs/heads/*/for-linus:refs/remotes/mine/*-blah' invalid
-
-test_refspec fetch 'refs/heads*/for-linus:refs/remotes/mine/*' invalid
-test_refspec push 'refs/heads*/for-linus:refs/remotes/mine/*' invalid
-
-test_refspec fetch 'refs/heads/*/*/for-linus:refs/remotes/mine/*' invalid
-test_refspec push 'refs/heads/*/*/for-linus:refs/remotes/mine/*' invalid
-
-test_refspec fetch 'refs/heads/*/for-linus:refs/remotes/mine/*'
-test_refspec push 'refs/heads/*/for-linus:refs/remotes/mine/*'
-
 test_done
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 528b9f65b1..0e21632f19 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -207,11 +207,7 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
 	fi
 '
 
-case $(uname -s) in
-*MINGW*) test_expect=test_expect_failure;;
-*)       test_expect=test_expect_success;;
-esac
-$test_expect 'checkout to detach HEAD with :/message' '
+test_expect_success 'checkout to detach HEAD with :/message' '
 
 	git checkout -f master && git clean -f &&
 	git checkout ":/Initial" &&