diff --git a/test/erl/Makefile.am b/test/erl/Makefile.am
index 309d07e..cfea7f9 100644
--- a/test/erl/Makefile.am
+++ b/test/erl/Makefile.am
@@ -27,6 +27,8 @@
 	  $(THRIFT) --gen erl $$f ; \
 	done ; \
 	$(THRIFT) --gen erl:legacynames LegacyNames.thrift
+	# make sure ThriftTest.thrift is generated last to prevent conflicts with other *.thrift files
+	$(THRIFT) --gen erl ../ThriftTest.thrift
 	touch .generated
 
 check: .generated