diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6d388c9..b05b9bd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,15 +9,15 @@ atk_test_CFLAGS = $(DBUS_CFLAGS) \
                   $(ATSPI_CFLAGS) \
                   -I$(top_builddir)\
                   -I$(top_srcdir)/tests/dummyatk/ \
-                  -I$(top_srcdir)/tests/dummyatk/.libs \
-                  -I$(top_srcdir)/tests/dummyatk/.deps \
+                  -I$(top_builddir)/tests/dummyatk/.libs \
+                  -I$(top_builddir)/tests/dummyatk/.deps \
                   -I$(top_srcdir)
 
-atk_test_LDFLAGS  = libxmlloader.la \
-                    libtestutils.la \
-                    $(GLIB_LIBS) \
-                    $(ATSPI_LIBS) \
-                    $(top_srcdir)/tests/dummyatk/libdummyatk.la
+atk_test_LDADD = libxmlloader.la \
+                 libtestutils.la \
+                 $(GLIB_LIBS) \
+                 $(ATSPI_LIBS) \
+                 $(top_builddir)/tests/dummyatk/libdummyatk.la
 
 atk_test_CPPFLAGS = -DTESTS_BUILD_DIR=\"$(top_builddir)/tests\" \
                     -DTESTS_SRC_DIR=\"$(top_srcdir)/tests\" \
@@ -34,12 +34,12 @@ app_test_CFLAGS = -I$(top_builddir) \
                    -I$(top_srcdir)/tests/dummyatk \
                    -I$(top_srcdir)/atk-adaptor
 
-app_test_LDFLAGS = libxmlloader.la \
-                   libtestutils.la \
-                   $(GLIB_LIBS) \
-                   $(ATK_LIBS) \
-                   $(top_srcdir)/tests/dummyatk/libdummyatk.la \
-                   $(top_srcdir)/atk-adaptor/libatk-bridge-2.0.la
+app_test_LDADD = libxmlloader.la \
+                 libtestutils.la \
+                 $(GLIB_LIBS) \
+                 $(ATK_LIBS) \
+                 $(top_builddir)/tests/dummyatk/libdummyatk.la \
+                 $(top_builddir)/atk-adaptor/libatk-bridge-2.0.la
 
 app_test_SOURCES = test-application.c
 
@@ -52,7 +52,7 @@ libxmlloader_la_CFLAGS = $(GLIB_CFLAGS) \
 libxmlloader_la_LIBADD = $(GLIB_LIBS) \
                          $(XML_LIBS) \
                          $(GOBJ_LIBS) \
-                         $(top_srcdir)/tests/dummyatk/libdummyatk.la \
+                         $(top_builddir)/tests/dummyatk/libdummyatk.la \
                          $(ATK_LIBS)
 
 libxmlloader_la_SOURCES = atk-object-xml-loader.c\