diff --git a/Makefile.am b/Makefile.am
index 880f23e..1fe2d28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -349,7 +349,8 @@ if COND_TESTS
 # DEJATOOL = src/testsuite/example-test.exp
 
 noinst_PROGRAMS = \
-	src/testsuite/test-history
+	src/testsuite/test-history \
+	src/testsuite/test-cairo_widget
 
 # disable : 
 #	src/testsuite/test-parse_command
@@ -379,6 +380,22 @@ src_testsuite_test_history_SOURCES = \
 		src/backend/static_thread.cc \
 		src/testsuite/test-history.cc
 
+src_testsuite_test_cairo_widget_CPPFLAGS = \
+		-I@top_srcdir@/src \
+		-I@top_srcdir@/src/templates \
+		$(CAIRO_CFLAGS) \
+		$(GTKMM_CFLAGS) \
+		$(GLIBMM_CFLAGS)
+src_testsuite_test_cairo_widget_LDFLAGS = \
+		$(CAIRO_LIBS) \
+		$(GTKMM_LIBS) \
+		$(GLIBMM_LIBS)
+src_testsuite_test_cairo_widget_SOURCES = \
+		src/cairo_elements.cc \
+		src/cairo_widget.cc \
+		src/testsuite/test-cairo_widget.cc
+
+
 #src_testsuite_test_parse_command_CPPFLAGS = \
 #		-I@top_srcdir@/src \
 #		-I@top_srcdir@/src/templates \