diff --git a/configure.ac b/configure.ac
index cd5f0da..db1591f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -216,6 +216,9 @@
 fi
 AM_CONDITIONAL(WITH_PHP_EXTENSION, [test "$have_php_extension" = "yes"])
 
+AC_PATH_PROG([PHPUNIT], [phpunit])
+AM_CONDITIONAL(HAVE_PHPUNIT, [test "x$PHPUNIT" != "x"])
+
 AX_THRIFT_LIB(ruby, [Ruby], yes)
 have_ruby=no
 if test "$with_ruby" = "yes"; then
@@ -487,6 +490,7 @@
   lib/perl/Makefile
   lib/perl/test/Makefile
   lib/php/Makefile
+  lib/php/test/Makefile
   lib/py/Makefile
   lib/rb/Makefile
   test/Makefile