diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 48d5878..12ae6c9 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -82,7 +82,12 @@
     # for matching files with file-include-regexp
     all-files-regexp: '.*'
     doc-files-regexp: '^docs/.*'
-    code-files-regexp: '^(?!docs|VERSION).*' # allow docs-only patchsets w/version bumps to skip code-level tests
+
+    # regex to allow docs-only patchsets w/version bumps to skip code-level
+    # tests.  Have to also ignore the commit message on negative match,
+    # per: https://issues.jenkins-ci.org/browse/JENKINS-19891
+    code-files-regexp: '^(?!docs|VERSION|\/COMMIT_MSG).*$'
+
 
     # Jenkins SSH host doc publisher
     docs-ssh-host: 'guide.opencord.org'
diff --git a/jjb/sonar.yaml b/jjb/sonar.yaml
index e99d779..72bbb62 100644
--- a/jjb/sonar.yaml
+++ b/jjb/sonar.yaml
@@ -49,7 +49,7 @@
           project-regexp: '^{project}$'
           branch-regexp: '{branch-regexp}'
           dependency-jobs: '{dependency-jobs}'
-          file-include-regexp: '{code-files-regexp}'
+          file-include-regexp: '{all-files-regexp}'
 
     properties:
       - cord-infra-properties:
@@ -93,7 +93,7 @@
           project-regexp: '^{project}$'
           branch-regexp: '{branch-regexp}'
           dependency-jobs: '{dependency-jobs}'
-          file-include-regexp: '{all-files-regexp}'
+          file-include-regexp: '{code-files-regexp}'
 
     properties:
       - cord-infra-properties: