diff --git a/test/py/Makefile.am b/test/py/Makefile.am
index e026077..b4be953 100644
--- a/test/py/Makefile.am
+++ b/test/py/Makefile.am
@@ -52,7 +52,11 @@
         gen-py-enum/ThriftTest/__init__.py \
         gen-py-enum/DebugProtoTest/__init__.py \
         gen-py-enum/DoubleConstantsTest/__init__.py \
-        gen-py-enum/Recursive/__init__.py
+        gen-py-enum/Recursive/__init__.py \
+        gen-py-type_hints/ThriftTest/__init__.py \
+        gen-py-type_hints/DebugProtoTest/__init__.py \
+        gen-py-type_hints/DoubleConstantsTest/__init__.py \
+        gen-py-type_hints/Recursive/__init__.py
 
 distdir:
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
@@ -119,6 +123,12 @@
 	&& $(THRIFT) --gen py:enum -out gen-py-enum ../v0.16/$(notdir $<) \
 	|| $(THRIFT) --gen py:enum -out gen-py-enum $<
 
+gen-py-type_hints/%/__init__.py: ../%.thrift $(THRIFT)
+	test -d gen-py-type_hints || $(MKDIR_P) gen-py-type_hints
+	test ../v0.16/$(notdir $<) \
+	&& $(THRIFT) --gen py:type_hints -out gen-py-type_hints ../v0.16/$(notdir $<) \
+	|| $(THRIFT) --gen py:type_hints -out gen-py-type_hints $<
+
 clean-local:
 	$(RM) -r build
 	find . -type f \( -iname "*.pyc" \) | xargs rm -f