diff --git a/.ci/dev/mswin/Jenkinsfile b/.ci/dev/mswin/Jenkinsfile
index ffbfbcb5d6..923a83ff85 100644
--- a/.ci/dev/mswin/Jenkinsfile
+++ b/.ci/dev/mswin/Jenkinsfile
@@ -55,7 +55,7 @@ pipeline {
                 stage('Unit Tests') {
                     agent { label 'mswin' }
                     steps {
-                        sh "./gradlew --no-daemon " +
+                        bat "./gradlew --no-daemon " +
                                 "--stacktrace " +
                                 "-Pcompilation.warningsAsErrors=false " +
                                 "-Ptests.failFast=true " +
@@ -80,7 +80,7 @@ pipeline {
                     }
                     agent { label 'mswin' }
                     steps {
-                        sh "./gradlew --no-daemon " +
+                        bat "./gradlew --no-daemon " +
                                 "clean integrationTest"
                     }
                     post {
diff --git a/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt b/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt
index 5e42f01c9b..2fb9e35196 100644
--- a/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt
@@ -11,7 +11,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 class NodeRPCTests {
-    private val CORDA_VERSION_REGEX = "\\d+(\\.\\d+)?(-\\w+)?".toRegex()
+    private val CORDA_VERSION_REGEX = "\\d+(\\.\\d+)?(\\.\\d+)?(-\\w+)?".toRegex()
     private val CORDA_VENDOR = "Corda Open Source"
     private val CORDAPPS = listOf(FINANCE_CONTRACTS_CORDAPP, FINANCE_WORKFLOWS_CORDAPP)
     private val CORDAPP_TYPES = setOf("Contract CorDapp", "Workflow CorDapp")