diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 0000000..1a95001
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,67 @@
+check_PROGRAMS = \
+	DebugProtoTest \
+	OptionalRequiredTest \
+	ReflectionTest
+
+TESTS = \
+	$(check_PROGRAMS)
+
+
+#
+# DebugProtoTest
+#
+DebugProtoTest_SOURCES = \
+	gen-cpp/DebugProtoTest_types.cpp \
+	DebugProtoTest.cpp
+
+DebugProtoTest_LDADD = \
+	$(top_srcdir)/lib/cpp/libthrift.la
+
+
+#
+# OptionalRequiredTest
+#
+OptionalRequiredTest_SOURCES = \
+	gen-cpp/OptionalRequiredTest_types.cpp \
+	OptionalRequiredTest.cpp
+
+OptionalRequiredTest_LDADD = \
+	$(top_srcdir)/lib/cpp/libthrift.la
+
+
+#
+# ReflectionTest
+#
+ReflectionTest_SOURCES = \
+	gen-cpp/DebugProtoTest_types.cpp \
+	gen-cpp/PartiallyReflectable.cpp \
+	gen-cpp/Service.cpp \
+	gen-cpp/StressTest_types.cpp \
+	ReflectionTest.cpp
+
+ReflectionTest_LDADD = \
+	$(top_srcdir)/lib/cpp/libthrift.la
+
+
+#
+# Common thrift code generation rules
+#
+THRIFT = $(top_srcdir)/compiler/cpp/thrift
+
+gen-cpp/DebugProtoTest_types.cpp gen-cpp/PartiallyReflectable.cpp: DebugProtoTest.thrift
+	$(THRIFT) -cpp $<
+
+gen-cpp/OptionalRequiredTest_types.cpp: OptionalRequiredTest.thrift
+	$(THRIFT) -cpp $<
+
+gen-cpp/Service.cpp gen-cpp/StressTest_types.cpp: StressTest.thrift
+	$(THRIFT) -cpp $<
+
+
+INCLUDES = \
+	-I$(top_srcdir)/lib/cpp/src
+
+AM_CPPFLAGS = $(BOOST_CPPFLAGS)
+
+clean-local:
+	rm -rf gen-cpp