diff --git a/tests/accessibility/Makefile.am b/tests/accessibility/Makefile.am
index 2e6739d2f..85aa43a7c 100644
--- a/tests/accessibility/Makefile.am
+++ b/tests/accessibility/Makefile.am
@@ -1,66 +1,34 @@
 include $(top_srcdir)/build/autotools/Makefile.am.silent
 
-EXAMPLES				= 	cally-atkcomponent-example 	\
-						cally-atkeditabletext-example   \
-						cally-atkevents-example		\
-						cally-atktext-example		\
-						cally-clone-example
+common_ldadd = \
+	$(top_builddir)/clutter/libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la
 
-common_ldadd			= $(top_builddir)/clutter/libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la
+common_sources = \
+	cally-examples-util.c	\
+	cally-examples-util.h
 
-common_sources			= cally-examples-util.c cally-examples-util.h
+INCLUDES = \
+	-I$(top_srcdir)	\
+	-I$(top_srcdir)/clutter \
+	-I$(top_builddir)/clutter \
+	-I$(top_srcdir)/tests/accessibility
 
-INCLUDES 				= \
-					-I$(top_srcdir)			\
-					-I$(top_srcdir)/clutter 	\
-					-I$(top_srcdir)/clutter/cogl 	\
-					-I$(top_builddir)/clutter 	\
-					-I$(top_builddir)/clutter/cogl	\
-					-I$(top_srcdir)/tests/accessibility
+AM_CPPFLAGS = -DPREFIXDIR=\"$(libdir)\"
+AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
+LDADD = $(common_ldadd) $(CLUTTER_LIBS)
 
-noinst_PROGRAMS				= 	$(EXAMPLES)
+noinst_PROGRAMS = \
+	cally-atkcomponent-example	\
+	cally-atkeditabletext-example   \
+	cally-atkevents-example		\
+	cally-atktext-example		\
+	cally-clone-example
 
-EXTRA_DIST				=	$(common_sources)
-
-# atk component example
-cally_atkcomponent_example_LDADD	= 	$(CLUTTER_LIBS) $(common_ldadd)
-cally_atkcomponent_example_CFLAGS	= 	$(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)	\
-						-DPREFIXDIR=\"$(libdir)\"	\
-						$(INCLUDES)
-cally_atkcomponent_example_SOURCES	= 	cally-atkcomponent-example.c	\
-						$(common_sources)
-
-# atk text example
-cally_atktext_example_LDADD		= 	$(CLUTTER_LIBS) $(common_ldadd)
-cally_atktext_example_CFLAGS		= 	$(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)\
-						-DPREFIXDIR=\"$(libdir)\"	\
-						$(INCLUDES)
-cally_atktext_example_SOURCES		= 	cally-atktext-example.c	\
-						$(common_sources)
-
-# atk text example2
-cally_atkevents_example_LDADD		= 	$(CLUTTER_LIBS) $(common_ldadd)
-cally_atkevents_example_CFLAGS		= 	$(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)\
-						-DPREFIXDIR=\"$(libdir)\"	\
-						$(INCLUDES)
-cally_atkevents_example_SOURCES		= 	cally-atkevents-example.c	\
-						$(common_sources)
-
-# atk editable text example
-cally_atkeditabletext_example_LDADD	= 	$(CLUTTER_LIBS) $(common_ldadd)
-cally_atkeditabletext_example_CFLAGS	= 	$(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) \
-						-DPREFIXDIR=\"$(libdir)\"	\
-						$(INCLUDES)
-cally_atkeditabletext_example_SOURCES	= 	cally-atkeditabletext-example.c	\
-						$(common_sources)
-
-# cally clone example
-cally_clone_example_LDADD		= 	$(CLUTTER_LIBS) $(common_ldadd)
-cally_clone_example_CFLAGS		= 	$(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) \
-						-DPREFIXDIR=\"$(libdir)\"	\
-						$(INCLUDES)
-cally_clone_example_SOURCES		= 	cally-clone-example.c		\
-						$(common_sources)
+cally_atkcomponent_example_SOURCES    = $(common_sources) cally-atkcomponent-example.c
+cally_atktext_example_SOURCES         = $(common_sources) cally-atktext-example.c
+cally_atkevents_example_SOURCES       = $(common_sources) cally-atkevents-example.c
+cally_atkeditabletext_example_SOURCES = $(common_sources) cally-atkeditabletext-example.c
+cally_clone_example_SOURCES           = $(common_sources) cally-clone-example.c
 
 DISTCLEANFILES =