diff --git a/.gitignore b/.gitignore
index 944520907..acbade121 100644
--- a/.gitignore
+++ b/.gitignore
@@ -217,6 +217,8 @@
 /test/perl/Makefile
 /test/perl/Makefile.in
 /test/php/gen-*
+/test/php/Makefile
+/test/php/Makefile.in
 /test/py/Makefile
 /test/py/Makefile.in
 /test/py/gen-py
@@ -236,4 +238,4 @@
 *.cache
 *.user
 *.ipch
-*.sdf
\ No newline at end of file
+*.sdf
diff --git a/configure.ac b/configure.ac
old mode 100644
new mode 100755
index 07692daae..cd5f0da05
--- a/configure.ac
+++ b/configure.ac
@@ -493,6 +493,7 @@ AC_CONFIG_FILES([
   test/cpp/Makefile
   test/hs/Makefile
   test/nodejs/Makefile
+  test/php/Makefile
   test/perl/Makefile
   test/py/Makefile
   test/py.twisted/Makefile
diff --git a/test/Makefile.am b/test/Makefile.am
index f45424a12..2b3b8a93c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -27,6 +27,10 @@ if WITH_PERL
 SUBDIRS += perl
 endif
 
+if WITH_PHP
+SUBDIRS += php
+endif
+
 if WITH_PYTHON
 SUBDIRS += py
 SUBDIRS += py.twisted
diff --git a/test/php/Makefile b/test/php/Makefile.am
old mode 100644
new mode 100755
similarity index 83%
rename from test/php/Makefile
rename to test/php/Makefile.am
index aa35c6e93..162590330
--- a/test/php/Makefile
+++ b/test/php/Makefile.am
@@ -17,23 +17,16 @@
 # under the License.
 #
 
-# Default target is everything
-target: all
-
-# Tools
-THRIFT = ../../compiler/cpp/thrift
-
-all: normal inline
-
-normal: stubs
-
-inline: stubs-inline
+THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 stubs: ../ThriftTest.thrift
 	$(THRIFT) --gen php ../ThriftTest.thrift
-
-stubs-inline: ../ThriftTest.thrift
 	$(THRIFT) --gen php:inlined ../ThriftTest.thrift
 
-clean:
+check: stubs
+
+clean-local:
 	$(RM) -r gen-php gen-phpi
+
+client: stubs
+	php TestClient.php
diff --git a/test/test.sh b/test/test.sh
index 071b5e552..30a370934 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -118,6 +118,10 @@ do_test "perl-cpp"  "binary" "buffered-ip" \
         "perl -I perl/gen-perl/ -I../lib/perl/lib/ perl/TestClient.pl" \
         "cpp/TestServer" \
         "10"
+do_test "php-cpp"  "binary" "buffered-ip" \
+        "make -C php/ client" \
+        "cpp/TestServer" \
+        "10"
 do_test "nodejs-nodejs" "binary" "framed-ip" \
         "make -C nodejs/ client" \
         "make -C nodejs/ server" \