diff --git a/bin/odfvalidator.sh.in b/bin/odfvalidator.sh.in
index 99b2207ad138..a70cf8cd5b36 100644
--- a/bin/odfvalidator.sh.in
+++ b/bin/odfvalidator.sh.in
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-java -Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl -Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl -jar @TARFILE_LOCATION_NATIVE@/@ODFVALIDATOR_JAR@ "$@"
+@JAVAINTERPRETER@ -Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl -Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl -jar @TARFILE_LOCATION@/@ODFVALIDATOR_JAR@ "$@"
diff --git a/bin/officeotron.sh.in b/bin/officeotron.sh.in
index 935ec5809cdd..3d60c798deef 100644
--- a/bin/officeotron.sh.in
+++ b/bin/officeotron.sh.in
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-java -jar @TARFILE_LOCATION_NATIVE@/@OFFICEOTRON_JAR@ "$@"
+@JAVAINTERPRETER@ -jar @TARFILE_LOCATION@/@OFFICEOTRON_JAR@ "$@"
diff --git a/bin/verapdf.sh.in b/bin/verapdf.sh.in
index 4de68605b66f..859f4dc2e9d8 100644
--- a/bin/verapdf.sh.in
+++ b/bin/verapdf.sh.in
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-@JAVAINTERPRETER@ -jar @TARFILE_LOCATION_NATIVE@/@VERAPDF_JAR@ --nonpdfext "$@"
+@JAVAINTERPRETER@ -jar @TARFILE_LOCATION@/@VERAPDF_JAR@ --nonpdfext "$@"
diff --git a/configure.ac b/configure.ac
index 37ef3a40ed59..c3c367fc9aed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6697,10 +6697,7 @@ else
     PathFormat "${absolute_path}"
     TARFILE_LOCATION="${formatted_path_unix}"
 fi
-PathFormat "$TARFILE_LOCATION"
-TARFILE_LOCATION_NATIVE="$formatted_path"
 AC_SUBST(TARFILE_LOCATION)
-AC_SUBST(TARFILE_LOCATION_NATIVE)
 
 AC_MSG_CHECKING([whether we want to fetch tarballs])
 if test "$enable_fetch_external" != "no"; then
@@ -16292,6 +16289,11 @@ if test -n "$WSL_ONLY_AS_HELPER"; then
     SRC_ROOT="$formatted_path"
     PathFormat "$BUILDDIR"
     BUILDDIR="$formatted_path"
+    # TARFILE_LOCATION and JAVAINTERPRETER are used in the validator scripts
+    PathFormat "$TARFILE_LOCATION"
+    TARFILE_LOCATION_="$formatted_path"
+    PathFormat "$JAVAINTERPRETER"
+    JAVAINTERPRETER="$formatted_path"
     # git-bash has (gnu) tar, curl and sha256sum
     CURL="curl.exe"
     WGET=