diff --git a/compat/mingw.c b/compat/mingw.c
index e16b36444d16cd..5c97a8453dead1 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -548,9 +548,8 @@ static int current_directory_len = 0;
 int mingw_chdir(const char *dirname)
 {
 	int result;
-	wchar_t wdirname[MAX_PATH];
-	/* SetCurrentDirectoryW doesn't support long paths */
-	if (xutftowcs_path(wdirname, dirname) < 0)
+	wchar_t wdirname[MAX_LONG_PATH];
+	if (xutftowcs_long_path(wdirname, dirname) < 0)
 		return -1;
 	result = _wchdir(wdirname);
 	current_directory_len = GetCurrentDirectoryW(0, NULL);
diff --git a/t/t2027-checkout-long-paths.sh b/t/t2029-checkout-long-paths.sh
similarity index 94%
rename from t/t2027-checkout-long-paths.sh
rename to t/t2029-checkout-long-paths.sh
index e65a38da4da79b..01e5303a1afbcd 100755
--- a/t/t2027-checkout-long-paths.sh
+++ b/t/t2029-checkout-long-paths.sh
@@ -30,17 +30,17 @@ test_expect_success 'checkout of long paths without core.longpaths fails' '
 	git config core.longpaths false &&
 	test_must_fail git checkout -f 2>error &&
 	grep -q "Filename too long" error &&
-	test_path_is_missing longpa~1/longtestfile
+	test ! -d longpa*
 '
 
 test_expect_success 'checkout of long paths with core.longpaths works' '
 	git config core.longpaths true &&
 	git checkout -f &&
-	test_path_is_file longpa~1/longtestfile
+	test_path_is_file longpa*/longtestfile
 '
 
 test_expect_success 'update of long paths' '
-	echo frotz >> longpa~1/longtestfile &&
+	echo frotz >>$(ls longpa*/longtestfile) &&
 	echo $path > expect &&
 	git ls-files -m > actual &&
 	test_cmp expect actual &&
@@ -52,7 +52,10 @@ test_expect_success 'update of long paths' '
 test_expect_success cleanup '
 	# bash cannot delete the trash dir if it contains a long path
 	# lets help cleaning up (unless in debug mode)
-	test ! -z "$debug" || rm -rf longpa~1
+	if test -z "$debug"
+	then
+		rm -rf longpa~1
+	fi
 '
 
 # check that the template used in the test won't be too long: