diff --git a/R/model.R b/R/model.R
index 8db71a17..c3ef104c 100644
--- a/R/model.R
+++ b/R/model.R
@@ -672,7 +672,7 @@ compile <- function(quiet = TRUE,
       ),
       run_log <- wsl_compatible_run(
         command = make_cmd(),
-        args = c(wsl_safe_path(tmp_exe),
+        args = c(wsl_safe_path(repair_path(tmp_exe)),
                 cpp_options_to_compile_flags(cpp_options),
                 stancflags_val),
         wd = cmdstan_path(),
diff --git a/tests/testthat/test-install.R b/tests/testthat/test-install.R
index 211a19c3..5d415543 100644
--- a/tests/testthat/test-install.R
+++ b/tests/testthat/test-install.R
@@ -1,4 +1,6 @@
 context("install")
+# Current tests need CmdStan 2.35 for stock rtools, but is not yet released
+skip_if(Sys.getenv("CMDSTANR_USE_RTOOLS") != "")
 
 cmdstan_test_tarball_url <- Sys.getenv("CMDSTAN_TEST_TARBALL_URL")
 if (!nzchar(cmdstan_test_tarball_url)) {