diff --git a/Jenkinsfile.nightly b/Jenkinsfile.nightly
index 39916c6c65e..d8a0efe72bf 100644
--- a/Jenkinsfile.nightly
+++ b/Jenkinsfile.nightly
@@ -42,7 +42,7 @@ pipeline {
     stage('Check environment') {
       when {
         anyOf {
-          expression { return !currentBuild.changeSets.isEmpty() }
+          expression { return util.hasChanges(scmVars) }
           triggeredBy cause: 'UserIdCause'
         }
       }
@@ -67,7 +67,7 @@ pipeline {
     stage('Collect reference build') {
       when {
         anyOf {
-          expression { return !currentBuild.changeSets.isEmpty() }
+          expression { return util.hasChanges(scmVars) }
           triggeredBy cause: 'UserIdCause'
         }
       }
@@ -80,7 +80,7 @@ pipeline {
     stage('Build and run nightly tests') {
       when {
         anyOf {
-          expression { return !currentBuild.changeSets.isEmpty() }
+          expression { return util.hasChanges(scmVars) }
           triggeredBy cause: 'UserIdCause'
         }
       }
@@ -106,7 +106,7 @@ pipeline {
           expression { return currentBuild.result == 'SUCCESS' || currentBuild.result == 'UNSTABLE' }
           branch 'dev'
           anyOf {
-            expression { return !currentBuild.changeSets.isEmpty() }
+            expression { return util.hasChanges(scmVars) }
             triggeredBy cause: 'UserIdCause'
           }
         }
@@ -123,7 +123,7 @@ pipeline {
       when {
         allOf {
           branch 'dev'
-          expression { return !currentBuild.changeSets.isEmpty() }
+          expression { return util.hasChanges(scmVars) }
           expression { return currentBuild.result == 'SUCCESS' || currentBuild.result == 'UNSTABLE' }
         }
       }