diff --git a/lib/py/Makefile.am b/lib/py/Makefile.am
index 1d450ee..c6c5ff3 100644
--- a/lib/py/Makefile.am
+++ b/lib/py/Makefile.am
@@ -29,6 +29,7 @@
 	$(PYTHON3) test/thrift_TBinaryProtocol.py
 	$(PYTHON3) test/thrift_TZlibTransport.py
 	$(PYTHON3) test/thrift_TCompactProtocol.py
+	$(PYTHON3) test/thrift_TNonblockingServer.py
 else
 py3-build:
 py3-test:
@@ -36,6 +37,7 @@
 
 all-local: py3-build
 	$(PYTHON) setup.py build
+	${THRIFT} --gen py test/test_thrift_file/TestServer.thrift
 
 # We're ignoring prefix here because site-packages seems to be
 # the equivalent of /usr/local/lib in Python land.
@@ -51,10 +53,12 @@
 	$(PYTHON) test/thrift_TBinaryProtocol.py
 	$(PYTHON) test/thrift_TZlibTransport.py
 	$(PYTHON) test/thrift_TCompactProtocol.py
+	$(PYTHON) test/thrift_TNonblockingServer.py
 
 
 clean-local:
 	$(RM) -r build
+	$(RM) -r gen-py
 	find . -type f \( -iname "*.pyc" \) | xargs rm -f
 	find . -type d \( -iname "__pycache__" -or -iname "_trial_temp" \) | xargs rm -rf