diff --git a/test/c_glib/Makefile.am b/test/c_glib/Makefile.am
index 1dc8c16..de23cb9 100755
--- a/test/c_glib/Makefile.am
+++ b/test/c_glib/Makefile.am
@@ -29,7 +29,8 @@
 libtestcglib_la_LIBADD = $(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 check_PROGRAMS = \
-	test_client
+	test_client \
+	test_server
 
 test_client_SOURCES = \
 	src/test_client.c
@@ -38,6 +39,15 @@
 	libtestcglib.la \
 	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
+test_server_SOURCES = \
+	src/thrift_test_handler.c \
+	src/thrift_test_handler.h \
+	src/test_server.c
+
+test_server_LDADD = \
+	libtestcglib.la \
+	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
+
 #
 # Common thrift code generation rules
 #
@@ -55,4 +65,7 @@
 	$(RM) -r gen-c_glib
 
 EXTRA_DIST = \
-	src/test_client.c
+	src/test_client.c \
+	src/thrift_test_handler.c \
+	src/thrift_test_handler.h \
+	src/test_server.c