diff --git a/bin/UTscapy.bat b/bin/UTscapy.bat
index 8b665f706400efa2a6b9b283f3e28cd4903feffe..ba66429cd63196273a0f0735cca0f819b39a7be3 100755
--- a/bin/UTscapy.bat
+++ b/bin/UTscapy.bat
@@ -1,4 +1,4 @@
 @echo off
 REM Use Python to run the UTscapy script from the current directory, passing all parameters
 title UTscapy
-python %~dp0\UTscapy %*
+python "%~dp0\UTscapy %*"
diff --git a/bin/scapy.bat b/bin/scapy.bat
index e0f064c597152b2d3b83e65508544b019890268c..858178385d2ca57d9890eccc4c9af656312ab0ed 100755
--- a/bin/scapy.bat
+++ b/bin/scapy.bat
@@ -1,4 +1,4 @@
 @echo off
 REM Use Python to run the Scapy script from the current directory, passing all parameters
 title scapy
-python %~dp0\scapy %*
+python "%~dp0\scapy %*"
diff --git a/test/run_tests.bat b/test/run_tests.bat
index f2d818bf6c2e3bba0acea21709ddb976b189351a..91206414f2b8f21517b65387dba3bb9c8309b7f2 100644
--- a/test/run_tests.bat
+++ b/test/run_tests.bat
@@ -3,7 +3,7 @@ set MYDIR=%cd%\..
 set PYTHONPATH=%MYDIR%
 if [%1]==[] (
   SET date=%DATE%
-  python %MYDIR%\scapy\tools\UTscapy.py -t regression.uts -f html -o scapy_regression_test_%date:~6,4%_%date:~3,2%_%date:~0,2%.html
+  python "%MYDIR%\scapy\tools\UTscapy.py -t regression.uts -f html -o scapy_regression_test_%date:~6,4%_%date:~3,2%_%date:~0,2%.html"
 ) else (
-  python %MYDIR%\scapy\tools\UTscapy.py %1 %2 %3 %4 %5 %6 %7 %8 %9
+  python "%MYDIR%\scapy\tools\UTscapy.py %@"
 )