diff --git a/Examples/test-suite/php/evil_diamond_prop_runme.php b/Examples/test-suite/php/evil_diamond_prop_runme.php
index 02d9944d6..9bdb7435f 100644
--- a/Examples/test-suite/php/evil_diamond_prop_runme.php
+++ b/Examples/test-suite/php/evil_diamond_prop_runme.php
@@ -31,7 +31,9 @@ check::is_a($spam,"spam");
 check::equal(1,$spam->_foo,"1==spam->_foo");
 check::equal(2,$spam->_bar,"2==spam->_bar");
 // multiple inheritance not supported in PHP
+set_error_handler(NULL, 0); // Don't complain that _baz is unknown.
 check::equal(null,$spam->_baz,"null==spam->_baz");
+restore_error_handler();
 check::equal(4,$spam->_spam,"4==spam->_spam");
 
 check::done();
diff --git a/Examples/test-suite/php/li_std_string_runme.php b/Examples/test-suite/php/li_std_string_runme.php
index dbf0228df..04ee3fc86 100644
--- a/Examples/test-suite/php/li_std_string_runme.php
+++ b/Examples/test-suite/php/li_std_string_runme.php
@@ -3,17 +3,6 @@
 require "tests.php";
 require "li_std_string.php";
 
-function die_on_error($errno, $errstr, $file, $line) {
-    if ($file !== Null) {
-        print $file;
-        if ($line !== Null) print ":$line";
-        print ": ";
-    }
-    print "$errstr\n";
-    exit(1);
-}
-set_error_handler("die_on_error", -1);
-
 // Global variables
 //$s="initial string";
 //check::equal(GlobalString2_get() ,"global string 2", "GlobalString2 test 1");
diff --git a/Examples/test-suite/php/tests.php b/Examples/test-suite/php/tests.php
index 3e835128e..20fa1ed98 100644
--- a/Examples/test-suite/php/tests.php
+++ b/Examples/test-suite/php/tests.php
@@ -1,5 +1,16 @@
 <?php
 
+function die_on_error($errno, $errstr, $file, $line) {
+    if ($file !== Null) {
+        print $file;
+        if ($line !== Null) print ":$line";
+        print ": ";
+    }
+    print "$errstr\n";
+    exit(1);
+}
+set_error_handler("die_on_error", -1);
+
 $_original_functions=get_defined_functions();
 $_original_globals=1;
 $_original_classes=get_declared_classes();