diff --git a/bin/cxxtestgen.bat b/bin/cxxtestgen.bat
index 95d7d14..620db7b 100644
--- a/bin/cxxtestgen.bat
+++ b/bin/cxxtestgen.bat
@@ -1,3 +1,8 @@
 @echo off
-rem Just run the python script
-python %0 %*
+setlocal
+
+rem Strip .bat extension, if present
+set me=%0
+if "%me:~-4,4%" == ".bat" (set py=%me:~0,-4%) else (set py=%me%)
+rem Run the python script
+python %py% %*