diff --git a/config/pmd.xml b/config/pmd.xml
index 6d175065f..5b7f9e69f 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -109,8 +109,8 @@
   <rule ref="rulesets/java/design.xml">
     <!-- this produce false positives on gui.Main -->
     <exclude name="UseUtilityClass"/>
-    <exclude name="AvoidReassigningParameters"/>
-    <exclude name="SwitchDensity"/>
+    <!--<exclude name="AvoidReassigningParameters"/>-->
+    <!--<exclude name="SwitchDensity"/>-->
     <exclude name="ConstructorCallsOverridableMethod"/>
     <exclude name="AccessorClassGeneration"/>
     <exclude name="FinalFieldCouldBeStatic"/>
@@ -165,6 +165,12 @@
       <property name="problemDepth" value="4"/>
     </properties>
   </rule>
+  <rule ref="rulesets/java/design.xml/SwitchDensity">
+    <properties>
+      <!-- till #973 -->
+      <property name="violationSuppressXPath" value="//ClassOrInterfaceDeclaration[@Image='DeclarationOrderCheck']"/>
+    </properties>
+  </rule>
 
   <rule ref="rulesets/java/empty.xml"/>
   <rule ref="rulesets/java/finalizers.xml"/>