diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSharingViolationsNestedClassTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSharingViolationsNestedClassTest.java
index 64ac540a72..eeb69d0d64 100644
--- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSharingViolationsNestedClassTest.java
+++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSharingViolationsNestedClassTest.java
@@ -86,8 +86,10 @@ public class ApexSharingViolationsNestedClassTest extends RuleTst {
     public void testSharingPermutation() {
         String apexClass = generateClass(outerSharingDeclared, outerOperation, innerSharingDeclared, innerOperation);
         Report rpt = new Report();
-        runTestFromString(apexClass, new ApexSharingViolationsRule(), rpt,
-                LanguageRegistry.getLanguage(ApexLanguageModule.NAME).getDefaultVersion());
+        ApexSharingViolationsRule rule = new ApexSharingViolationsRule();
+        rule.setMessage("a message");
+        runTestFromString(apexClass, rule, rpt,
+                          LanguageRegistry.getLanguage(ApexLanguageModule.NAME).getDefaultVersion());
         List<RuleViolation> violations = rpt.getViolations();
         assertEquals("Unexpected Violation Size\n" + apexClass, expectedViolations, violations.size());
         List<Integer> lineNumbers = violations.stream().map(v -> v.getBeginLine()).collect(Collectors.toList());
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/AvoidTabCharacterRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/AvoidTabCharacterRule.java
index bb6359dff2..17d42833ad 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/AvoidTabCharacterRule.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/AvoidTabCharacterRule.java
@@ -35,7 +35,7 @@ public class AvoidTabCharacterRule extends AbstractPLSQLRule {
             while ((line = in.readLine()) != null) {
                 lineNumber++;
                 if (line.indexOf('\t') != -1) {
-                    addViolationWithMessage(data, null, "Tab characters are not allowed. Use spaces for indentation",
+                    addViolationWithMessage(data, node, "Tab characters are not allowed. Use spaces for indentation",
                             lineNumber, lineNumber);
 
                     if (!eachLine) {
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/LineLengthRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/LineLengthRule.java
index ecae7ee195..89aad4944e 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/LineLengthRule.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/LineLengthRule.java
@@ -43,7 +43,7 @@ public class LineLengthRule extends AbstractPLSQLRule {
             while ((line = in.readLine()) != null) {
                 lineNumber++;
                 if (line.length() > maxLineLength) {
-                    addViolationWithMessage(data, null, "The line is too long. Only " + maxLineLength + " characters are allowed.",
+                    addViolationWithMessage(data, node, "The line is too long. Only " + maxLineLength + " characters are allowed.",
                             lineNumber, lineNumber);
 
                     if (!eachLine) {
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLXPathRuleTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLXPathRuleTest.java
index 7dd9c46395..2925014989 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLXPathRuleTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLXPathRuleTest.java
@@ -59,6 +59,7 @@ public class PLSQLXPathRuleTest extends AbstractPLSQLParserTst {
         rule.setMessage("Test Violation");
 
         RuleContext ctx = new RuleContext();
+        ctx.setCurrentRule(rule);
         ctx.setLanguageVersion(plsql.getDefaultVersion());
 
         rule.apply(singletonList(node), ctx);
diff --git a/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java
index d3920f0e83..1dceeab9ae 100644
--- a/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java
+++ b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java
@@ -42,6 +42,11 @@ public class ScalaRuleTest extends BaseScalaTest {
     @Test
     public void testDummyRule() {
         ScalaRule rule = new ScalaRule() {
+            @Override
+            public String getMessage() {
+                return "a message";
+            }
+
             @Override
             public RuleContext visit(ASTTermApply node, RuleContext data) {
                 ASTTermName child = node.getFirstChildOfType(ASTTermName.class);