diff --git a/.azure-devops/create-release.yml b/.azure-devops/create-release.yml
index 572588f78..45d869c3b 100644
--- a/.azure-devops/create-release.yml
+++ b/.azure-devops/create-release.yml
@@ -39,6 +39,17 @@ stages:
 
       - template: templates/build-publish-azure-cli-test-sdk.yml
 
+    - job: 'recordVersion'
+      displayName: 'Install and verify version'
+      dependsOn: [Build_Publish_Azure_IoT_CLI_Extension, Build_Publish_Azure_CLI_Test_SDK]
+      steps:
+      - template: templates/setup-dev-test-env.yml
+        parameters:
+          pythonVersion: $(pythonVersion)
+          architecture: $(architecture)
+
+      - template: templates/install-and-record-version.yml
+
   - stage: 'test'
     displayName: 'Run tests'
     pool:
@@ -85,16 +96,6 @@ stages:
           runIntTests: 'false'
           runUnitTests: 'true'
 
-    - job: 'recordVersion'
-      displayName: 'Install and verify version'
-      steps:
-      - template: templates/setup-dev-test-env.yml
-        parameters:
-          pythonVersion: $(pythonVersion)
-          architecture: $(architecture)
-
-      - template: templates/install-and-record-version.yml
-
   - stage: 'kpi'
     displayName: 'Build KPIs'
     dependsOn: [build, test]
@@ -119,8 +120,8 @@ stages:
       pool:
         vmImage: 'vs2017-win2016'
       variables:
-        CLIVersion: $[ stageDependencies.test.recordVersion.outputs['setupVersion.CLIVersion'] ]
-        ReleaseTitle: $[ stageDependencies.test.recordVersion.outputs['setupVersion.ReleaseTitle'] ]
+        CLIVersion: $[ stageDependencies.build.recordVersion.outputs['setupVersion.CLIVersion'] ]
+        ReleaseTitle: $[ stageDependencies.build.recordVersion.outputs['setupVersion.ReleaseTitle'] ]
 
       steps:
       - task: DownloadBuildArtifacts@0
diff --git a/.azure-devops/templates/run-tests.yml b/.azure-devops/templates/run-tests.yml
index 58840281d..91db4af4f 100644
--- a/.azure-devops/templates/run-tests.yml
+++ b/.azure-devops/templates/run-tests.yml
@@ -18,6 +18,7 @@ steps:
 
   - ${{ if eq(parameters.runIntTests, 'true') }}:
     - task: AzureCLI@2
+      continueOnError: true
       displayName: '${{ parameters.name }} integration tests'
       inputs:
         azureSubscription: AzIoTCLIService