diff --git a/include/class.faq.php b/include/class.faq.php
index 4445a7cf7c9a262f0faf68e1e5bfa228ea062da6..70a7e2540dd91335c91e470c163abf430d0b63f1 100644
--- a/include/class.faq.php
+++ b/include/class.faq.php
@@ -112,7 +112,7 @@ class FAQ {
     function setKeywords($words) { $this->ht['keywords'] = $words; }
     function setNotes($text) { $this->ht['notes'] = $text; }
 
-    /* For ->attach() and ->detach(), use $this->attachments() */
+    /* For ->attach() and ->detach(), use $this->attachments() (nolint) */
     function attach($file) { return $this->_attachments->add($file); }
     function detach($file) { return $this->_attachments->remove($file); }
 
diff --git a/setup/test/tests/class.php_analyze.php b/setup/test/tests/class.php_analyze.php
index f066846645638c02fa5488987781f86145aafb56..9690c980afe51162da54164cc6c1d6b1b7fd08d2 100644
--- a/setup/test/tests/class.php_analyze.php
+++ b/setup/test/tests/class.php_analyze.php
@@ -195,7 +195,7 @@ class SourceAnalyzer extends Test {
                 break;
             case T_STATIC:
                 $c = current($this->tokens);
-                // static::func() or static::$var
+                // (nolint) static::func() or static::$var
                 if ($c[0] == T_PAAMAYIM_NEKUDOTAYIM)
                     break;
             case T_GLOBAL:
diff --git a/setup/test/tests/test.undefinedmethods.php b/setup/test/tests/test.undefinedmethods.php
index 4d22d1aafed62fcfe6d1b68dc985a03db6020343..2e06a452ba20d648f6b52c5f2c3cfd8fc3f0e818 100644
--- a/setup/test/tests/test.undefinedmethods.php
+++ b/setup/test/tests/test.undefinedmethods.php
@@ -32,7 +32,7 @@ function find_function_calls($scripts) {
         $lineno=0;
         foreach ($lines as $line) {
             $lineno++; $matches=array();
-            preg_match_all('/(?:-[>]|::)([a-zA-Z0-9_]+)\(.*/', $line, $matches,
+            preg_match_all('/^.*\w+(?:-[>]|::)([a-zA-Z0-9_]+)\(.*/', $line, $matches,
                 PREG_SET_ORDER);
             foreach ($matches as $m)
                 if (strpos($m[0], 'nolint') === false)