diff --git a/Jenkinsfile b/Jenkinsfile
index 3181bd5..0648214 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -108,6 +108,7 @@ pipeline {
                 exit /b 1
             )
             dir C:\\Instrument\\Apps
+            call \\\\isis.cclrc.ac.uk\\inst\$\\Kits\$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-22\\genie_python_install.bat
             """
          }
         }
@@ -150,8 +151,8 @@ pipeline {
                 pushd "C:\\Instrument\\Apps\\EPICS"
                 call config_env.bat
                 REM make will stop on first test failure as python will return an error. We can pass -i to make to ignore
-		REM this and we will still usually see a problem as the python unittest XML output will list it, but we miss
-		REM the case when python crashes with no XML output. So we will move back to not using -i for now
+                REM this and we will still usually see a problem as the python unittest XML output will list it, but we miss
+                REM the case when python crashes with no XML output. So we will move back to not using -i for now
                 make ioctests
                 set errcode2=%errorlevel%
                 popd
diff --git a/run_tests.bat b/run_tests.bat
index 8d69749..f42d8c8 100644
--- a/run_tests.bat
+++ b/run_tests.bat
@@ -1,12 +1,26 @@
 setlocal
 call create_virtual_env.bat
 call %EPICS_ROOT%\stop_ibex_server.bat
-python test_setup_teardown.py>base_line_memory.txt
+"%PYTHON3%" test_setup_teardown.py>base_line_memory.txt
 set /P BASE_MEMORY_USAGE=<base_line_memory.txt
 call %EPICS_ROOT%\start_ibex_server.bat
 set "PYTHONUNBUFFERED=1"
 set "exitcode=0"
-python -u "%~dp0run_tests.py" %*
+
+REM use cdb rather than windbg as jenkins is non interactive
+for /D %%I in ( "C:\Program Files (x86)\Windows Kits\*" ) do (
+    if exist "%%I\Debuggers\x64\cdb.exe" SET "WINDBG=%%I\Debuggers\x64\cdb.exe"
+)
+
+REM we use the python3 executable rather than python as this allows us to
+REM configure the applicatrion verifier for python3.exe and we don't get
+REM a lot of logs every time tests spawn python.exe for e.g. emulators
+if not "%yyyWINDBG%" == "" (
+    "%WINDBG%" -g -xd av -xd ch -xd sov "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %*
+) else (
+REM    "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %*
+    "%PYTHON3%" -u "%~dp0run_tests.py" %*
+)
 IF %errorlevel% NEQ 0 (
     set exitcode=%errorlevel%
     echo ERROR - Running base tests failed with code %errorlevel%
@@ -20,6 +34,6 @@ IF %errorlevel% NEQ 0 (
 )
 
 :finish
-python test_setup_teardown.py --tear_down
+"%PYTHON3%" test_setup_teardown.py --tear_down
 call %EPICS_ROOT%\stop_ibex_server.bat
 EXIT /b %exitcode%