diff --git a/test cases/common/16 configure file/meson.build b/test cases/common/16 configure file/meson.build
index 281e0b3d4..33af22001 100644
--- a/test cases/common/16 configure file/meson.build	
+++ b/test cases/common/16 configure file/meson.build	
@@ -15,13 +15,14 @@ e = executable('inctest', 'prog.c', include_dirs : include_directories('.'))
 test('inctest', e)
 
 # Now generate a header file with an external script.
-genprog = find_program('generator.py')
+genprog = find_program('python3')
+scriptfile = '@0@/generator.py'.format(meson.current_source_dir())
 ifile = '@0@/dummy.dat'.format(meson.current_source_dir())
 ofile = '@0@/config2.h'.format(meson.current_build_dir())
 
 configure_file(input : 'dummy.dat',
 output : 'config2.h',
-command : [genprog, ifile, ofile])
+command : [genprog, scriptfile,  ifile, ofile])
 
 test('inctest2', executable('prog2', 'prog2.c',
 include_dirs : include_directories('.')))
diff --git a/test cases/common/55 file grabber/grabber2.bat b/test cases/common/55 file grabber/grabber2.bat
new file mode 100644
index 000000000..d1a3f98ba
--- /dev/null
+++ b/test cases/common/55 file grabber/grabber2.bat	
@@ -0,0 +1,5 @@
+@ECHO OFF
+echo suba.c
+echo subb.c
+echo subc.c
+echo subprog.c
diff --git a/test cases/common/55 file grabber/meson.build b/test cases/common/55 file grabber/meson.build
index c32af0743..f5c5b3cc2 100644
--- a/test cases/common/55 file grabber/meson.build	
+++ b/test cases/common/55 file grabber/meson.build	
@@ -11,7 +11,7 @@ project('grabber', 'c')
 
 if build.name() == 'windows'
   c = run_command('grabber.bat')
-  grabber = find_program('grabber.bat')
+  grabber = find_program('grabber2.bat')
 else
   c = run_command('grabber.sh')
   grabber = find_program('grabber.sh')