diff --git a/test/py/Makefile.am b/test/py/Makefile.am
index 252f586..6daa26d 100644
--- a/test/py/Makefile.am
+++ b/test/py/Makefile.am
@@ -3,10 +3,12 @@
 py_unit_tests =                                 \
         SerializationTest.py                    \
         TestEof.py                              \
+        TestSyntax.py                           \
         RunClientServer.py
 
 thrift_gen =                                    \
-        gen-py/ThriftTest/__init__.py
+        gen-py/ThriftTest/__init__.py           \
+        gen-py/DebugProtoTest/__init__.py
 
 helper_scripts=                                 \
         TestClient.py                           \
@@ -20,7 +22,7 @@
 TESTS= $(py_unit_tests)
 
 
-gen-py/ThriftTest/__init__.py: ../ThriftTest.thrift
+gen-py/%/__init__.py: ../%.thrift
 	$(THRIFT) --gen py $<
 
 clean-local:
diff --git a/test/py/TestSyntax.py b/test/py/TestSyntax.py
new file mode 100755
index 0000000..2921419
--- /dev/null
+++ b/test/py/TestSyntax.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+import sys, glob
+sys.path.insert(0, './gen-py')
+sys.path.insert(0, glob.glob('../../lib/py/build/lib.*')[0])
+
+# Just import these generated files to make sure they are syntactically valid
+from DebugProtoTest import EmptyService