Index: smoketest.php
===================================================================
--- smoketest.php	(revision 7002)
+++ smoketest.php	(working copy)
@@ -108,17 +108,7 @@
     exit(1);
 }
 
-# Check PHP4 handling of Xapian::DocNotFoundError
-$old_error_reporting = error_reporting();
-if ($old_error_reporting & E_WARNING)
-    error_reporting($old_error_reporting ^ E_WARNING);
-$doc2 = Database_get_document($db, 2);
-if ($doc2 != null) {
-    print "Retrieved non-existent document\n";
-    exit(1);
-}
-if ($old_error_reporting & E_WARNING)
-    error_reporting($old_error_reporting);
+include "smoketest".substr(PHP_VERSION, 0, 1).".php";
 
 # Regression test - overload resolution involving boolean types failed.
 Enquire_set_sort_by_value($enq, 1, TRUE);
Index: smoketest4.php
===================================================================
--- smoketest4.php	(revision 0)
+++ smoketest4.php	(revision 0)
@@ -0,0 +1,33 @@
+<?php
+/* PHP4 specific tests.
+ *
+ * Copyright (C) 2006 Olly Betts
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+
+# Check PHP4 handling of Xapian::DocNotFoundError
+$old_error_reporting = error_reporting();
+if ($old_error_reporting & E_WARNING)
+    error_reporting($old_error_reporting ^ E_WARNING);
+$doc2 = Database_get_document($db, 2);
+if ($doc2 != null) {
+    print "Retrieved non-existent document\n";
+    exit(1);
+}
+if ($old_error_reporting & E_WARNING)
+    error_reporting($old_error_reporting);
+?>
Index: smoketest5.php
===================================================================
--- smoketest5.php	(revision 0)
+++ smoketest5.php	(revision 0)
@@ -0,0 +1,31 @@
+<?php
+/* PHP5 specific tests.
+ *
+ * Copyright (C) 2006 Olly Betts
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+
+# Check PHP5 handling of Xapian::DocNotFoundError
+try {
+    $doc2 = Database_get_document($db, 2);
+    if ($doc2 != null) {
+	print "Retrieved non-existent document\n";
+	exit(1);
+    }
+} catch (e) {
+}
+?>