diff --git a/.gitignore b/.gitignore
index 7d423496f..94f25677c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,10 @@ rever/
 # Allow the lib
 !/xonsh/lib
 
+
+# Allow tests/bin
+!/tests/bin
+
 # elm
 xonsh/webconfig/elm-stuff/
 xonsh/webconfig/js/app.js
diff --git a/tests/bin/cat.bat b/tests/bin/cat.bat
index 3fc4e5e67..6ef3ba4f3 100644
--- a/tests/bin/cat.bat
+++ b/tests/bin/cat.bat
@@ -1,15 +1 @@
-@echo on
-call :s_which py.exe
-rem note that %~dp0 is dir of this batch script
-if not "%_path%" == "" (
-  py -3 %~dp0cat %*
-) else (
-  python %~dp0cat %*
-)
-
-goto :eof
-
-:s_which
-  setlocal
-  endlocal & set _path=%~$PATH:1
-  goto :eof
+@python %~dp0cat %*
diff --git a/tests/bin/pwd.bat b/tests/bin/pwd.bat
index c8aad4d5a..500275986 100644
--- a/tests/bin/pwd.bat
+++ b/tests/bin/pwd.bat
@@ -1,15 +1 @@
-@echo on
-call :s_which py.exe
-rem note that %~dp0 is dir of this batch script
-if not "%_path%" == "" (
-  py -3 %~dp0pwd %*
-) else (
-  python %~dp0pwd %*
-)
-
-goto :eof
-
-:s_which
-  setlocal
-  endlocal & set _path=%~$PATH:1
-  goto :eof
\ No newline at end of file
+@python %~dp0pwd %*
diff --git a/tests/bin/wc.bat b/tests/bin/wc.bat
index d807db56f..aa79f8a05 100644
--- a/tests/bin/wc.bat
+++ b/tests/bin/wc.bat
@@ -1,15 +1 @@
-@echo on
-call :s_which py.exe
-rem note that %~dp0 is dir of this batch script
-if not "%_path%" == "" (
-  py -3 %~dp0wc %*
-) else (
-  python %~dp0wc %*
-)
-
-goto :eof
-
-:s_which
-  setlocal
-  endlocal & set _path=%~$PATH:1
-  goto :eof
\ No newline at end of file
+@python %~dp0wc %*
diff --git a/tests/test_integrations.py b/tests/test_integrations.py
index 8adc4ae9a..fd094e219 100644
--- a/tests/test_integrations.py
+++ b/tests/test_integrations.py
@@ -57,7 +57,7 @@ skip_if_no_sleep = pytest.mark.skipif(
 def run_xonsh(cmd, stdin=sp.PIPE, stdout=sp.PIPE, stderr=sp.STDOUT, single_command=False):
     env = dict(os.environ)
     env["PATH"] = PATH
-    env["XONSH_DEBUG"] = "0" # was "1"
+    env["XONSH_DEBUG"] = "0"  # was "1"
     env["XONSH_SHOW_TRACEBACK"] = "1"
     env["RAISE_SUBPROC_ERROR"] = "0"
     env["PROMPT"] = ""
@@ -229,7 +229,7 @@ with open('tttt', 'w') as fp:
 
 ![cat tttt | wc]
 """,
-        "      1       2      10\n" if ON_WINDOWS else " 1  2 9 <stdin>\n",
+        " 1  2 10 <stdin>\n" if ON_WINDOWS else " 1  2 9 <stdin>\n",
         0,
     ),
     # test double  piping 'real' command
@@ -240,7 +240,7 @@ with open('tttt', 'w') as fp:
 
 ![cat tttt | wc | wc]
 """,
-        "      1       3      24\n" if ON_WINDOWS else " 1  4 16 <stdin>\n",
+        " 1  4 18 <stdin>\n" if ON_WINDOWS else " 1  4 16 <stdin>\n",
         0,
     ),
     # test unthreadable alias (which should trigger a ProcPoxy call)