diff --git a/config/pmd.xml b/config/pmd.xml
index 37451739a..f79baea8d 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -123,7 +123,9 @@
     <exclude name="PreserveStackTrace"/>
     <!-- till #997 -->
     <exclude name="EmptyMethodInAbstractClassShouldBeAbstract"/>
+    <!-- till #998 -->
     <exclude name="TooFewBranchesForASwitchStatement"/>
+    <!-- till #999 -->
     <exclude name="UseVarargs"/>
     <!-- we will use our own declaration order logic -->
     <exclude name="FieldDeclarationsShouldBeAtStartOfClass"/>