diff --git a/.github/workflows/R_CMD_check.yaml b/.github/workflows/R_CMD_check.yaml
index d2d4ddb..771d0b7 100644
--- a/.github/workflows/R_CMD_check.yaml
+++ b/.github/workflows/R_CMD_check.yaml
@@ -21,9 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: windows-latest, r: 'release'}  # Does not appear to have Java 32-bit, hence the --no-multiarch
           - {os: macOS-latest, r: 'release'}
           - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+          - {os: windows-latest, r: 'release'}  # Does not appear to have Java 32-bit, hence the --no-multiarch
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
diff --git a/tests/setup.R b/tests/setup.R
index 3d8c88d..b9ab91b 100644
--- a/tests/setup.R
+++ b/tests/setup.R
@@ -1,12 +1,12 @@
 # Download the JDBC drivers used in the tests
 
-oldJarFolder <- Sys.getenv("DATABASECONNECTOR_JAR_FOLDER")
+# oldJarFolder <- Sys.getenv("DATABASECONNECTOR_JAR_FOLDER")
 Sys.setenv("DATABASECONNECTOR_JAR_FOLDER" = file.path(tempdir(check = TRUE), "drivers"))
 DatabaseConnector::downloadJdbcDrivers("postgresql")
 # downloadJdbcDrivers("sql server")
 # downloadJdbcDrivers("oracle")
 
-withr::defer({
-  unlink(Sys.getenv("DATABASECONNECTOR_JAR_FOLDER"), recursive = TRUE, force = TRUE)
-  Sys.setenv("DATABASECONNECTOR_JAR_FOLDER" = oldJarFolder)
-}, testthat::teardown_env())
+# withr::defer({
+#   unlink(Sys.getenv("DATABASECONNECTOR_JAR_FOLDER"), recursive = TRUE, force = TRUE)
+#   Sys.setenv("DATABASECONNECTOR_JAR_FOLDER" = oldJarFolder)
+# }, testthat::teardown_env())