diff --git a/config/pmd.xml b/config/pmd.xml
index 8ded4f25f..03d427758 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -15,8 +15,6 @@
     <exclude name="ModifiedCyclomaticComplexity"/>
     <!-- we are using CyclomaticComplexity -->
     <exclude name="StdCyclomaticComplexity"/>
-    <!-- till #953 -->
-    <exclude name="NPathComplexity"/>
   </rule>
 
   <rule ref="rulesets/java/codesize.xml/CyclomaticComplexity">
@@ -33,6 +31,14 @@
       <property name="violationSuppressXPath" value="//MethodDeclaration[@Name='validateCli' and ../../..[@Image='Main']] | //MethodDeclaration[@Name='processSingleGeneric' and ../../..[@Image='GenericWhitespaceCheck']] | //MethodDeclaration[@Name='visitToken' and ../../..[@Image='FinalLocalVariableCheck']] | //MethodDeclaration[@Name='getJavadocTags' and ../../..[@Image='JavadocUtils']] | //MethodDeclaration[@Name='getDetails' and ../../..[@Image='RightCurlyCheck']] | //ClassOrInterfaceDeclaration[@Image='JavadocMethodCheck' or @Image='JavadocStyleCheck' or @Image='VariableDeclarationUsageDistanceCheck' or @Image='CustomImportOrderCheck']"/>
     </properties>
   </rule>
+  <rule ref="rulesets/java/codesize.xml/NPathComplexity">
+    <properties>
+      <!-- JavadocMethodCheck - deprecated
+           WhitespaceAroundCheck.isNotRelevantSituation - till #953
+      -->
+      <property name="violationSuppressXPath" value="//MethodDeclaration[@Name='isNotRelevantSituation' and ../../..[@Image='WhitespaceAroundCheck']] | //MethodDeclaration[@Name='validateCli' and ../../..[@Image='Main']] | //ClassOrInterfaceDeclaration[@Image='JavadocMethodCheck' or @Image='JavadocStyleCheck']"/>
+    </properties>
+  </rule>
   <rule ref="rulesets/java/codesize.xml/TooManyMethods">
     <properties>
       <property name="maxmethods" value="20"/>