diff --git a/setup/test/tests/class.test.php b/setup/test/tests/class.test.php
index 44842b3fef80d125623ae3ff4f6df8eeadcce9ec..a7f6c2fa044da245b2912c15e395755059d351c9 100644
--- a/setup/test/tests/class.test.php
+++ b/setup/test/tests/class.test.php
@@ -14,7 +14,7 @@ class Test {
         '/setup/cli/stage/',
         '/include/plugins/',
         '/include/h2o/',
-        '/include/fpdf/',
+        '/include/mpdf/',
     );
 
     function Test() {
diff --git a/setup/test/tests/test.syntax.php b/setup/test/tests/test.syntax.php
index 774ed964e466a20ce63b352fe7792d68769513d1..0adf1465a3fcca066262efe308222e8da1e48720 100644
--- a/setup/test/tests/test.syntax.php
+++ b/setup/test/tests/test.syntax.php
@@ -6,7 +6,7 @@ class SyntaxTest extends Test {
 
     function testCompileErrors() {
         $exit = 0;
-        foreach ($this->getAllScripts() as $s) {
+        foreach ($this->getAllScripts(false) as $s) {
             ob_start();
             system("php -l $s", $exit);
             $line = ob_get_contents();
diff --git a/setup/test/tests/test.undefinedmethods.php b/setup/test/tests/test.undefinedmethods.php
index 2e06a452ba20d648f6b52c5f2c3cfd8fc3f0e818..c767ba6ac1490c265be68b821419d348ff30fdce 100644
--- a/setup/test/tests/test.undefinedmethods.php
+++ b/setup/test/tests/test.undefinedmethods.php
@@ -17,10 +17,14 @@ class UndefinedMethods extends Test {
         }
         foreach (find_function_calls($scripts) as $call) {
             list($file, $no, $line, $func) = $call;
-            if (!in_array($func, $function_defs))
-                $this->fail($file, $no, "$func: Definitely undefined");
-            else
+            if (!in_array($func, $function_defs)) {
+                // We don't ship all of mdpf, so a bit of it looks undefined
+                if (strpos($file, '/mpdf/') === false)
+                    $this->fail($file, $no, "$func: Definitely undefined");
+            }
+            else {
                 $this->pass();
+            }
         }
     }
 }