diff --git a/test/Makefile.am b/test/Makefile.am
index 75630cc..dddad11 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -56,9 +56,13 @@
 	$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/test/ThriftTest.thrift
 
 EXTRA_DIST = \
+	keys \
 	test.sh \
+	test.py \
+	tests.json \
 	cpp \
 	hs \
+	lua \
 	ocaml \
 	perl \
 	php \
@@ -77,8 +81,12 @@
 	JavaBeansTest.thrift \
 	ManyOptionals.thrift \
 	ManyTypedefs.thrift \
+	NameConflictTest.thrift \
 	OptionalRequiredTest.thrift \
+	Recursive.thrift \
+	ReuseObjects.thrift \
 	SmallTest.thrift \
 	StressTest.thrift \
 	ThriftTest.thrift \
-	FastbinaryTest.py
+	FastbinaryTest.py \
+	README.md
diff --git a/test/go/Makefile.am b/test/go/Makefile.am
index a23402e..59450ce 100644
--- a/test/go/Makefile.am
+++ b/test/go/Makefile.am
@@ -27,7 +27,7 @@
 	grep -v list.*map.*list.*map $(THRIFTTEST) > ThriftTest.thrift
 
 # Thrift for GO has problems with complex map keys: THRIFT-2063
-gopath: $(THRIFT) ThriftTest.thrift 
+gopath: $(THRIFT) ThriftTest.thrift
 	mkdir src/gen
 	$(THRIFTCMD) ThriftTest.thrift
 	$(THRIFTCMD) ../StressTest.thrift
@@ -54,3 +54,6 @@
 	GOPATH=`pwd` $(GO) install code.google.com/p/gomock/mockgen
 	GOPATH=`pwd` bin/mockgen -destination=src/common/mock_handler.go -package=common gen/thrifttest ThriftTest
 
+EXTRA_DIST = \
+	src/bin \
+	src/common