diff --git a/.gitignore b/.gitignore
index eb8edd09..ed13528c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,7 @@ src/ofono.exp
 src/ofono.ver
 plugins/builtin.h
 drivers/builtin.h
+
+unit/test-common
+unit/test-util
+unit/test-sms
diff --git a/Makefile.am b/Makefile.am
index a6996a06..2bcf878d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = gdbus gatchat include plugins drivers src unit doc
+SUBDIRS = gdbus gatchat include plugins drivers unit src doc
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles
 
diff --git a/configure.ac b/configure.ac
index 258eb5fc..36fec5f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,5 +87,5 @@ AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
 
 AC_OUTPUT(Makefile gdbus/Makefile gatchat/Makefile
 			include/Makefile include/version.h src/Makefile
-			plugins/Makefile drivers/Makefile doc/Makefile
-			unit/Makefile)
+			plugins/Makefile drivers/Makefile unit/Makefile
+								doc/Makefile)
diff --git a/unit/Makefile.am b/unit/Makefile.am
index cf64e1ef..06b15086 100644
--- a/unit/Makefile.am
+++ b/unit/Makefile.am
@@ -1,27 +1,17 @@
 
-noinst_PROGRAMS = test-util test-common test-sms
+noinst_PROGRAMS = test-common test-util test-sms
 
-test_util_SOURCES = test-util.c ../src/util.c
+test_common_SOURCES = test-common.c $(top_builddir)/src/common.c
 
-test_util_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ -ldl
+test_util_SOURCES = test-util.c $(top_builddir)/src/util.c
 
-test_util_LDFLAGS = -Wl,--export-dynamic
+test_sms_SOURCES = test-sms.c $(top_builddir)/src/util.c \
+					$(top_builddir)/src/smsutil.c
 
-test_common_SOURCES = test-common.c ../src/common.c
+LDADD = @GLIB_LIBS@ @GTHREAD_LIBS@
 
-test_common_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ -ldl
+AM_CFLAGS = @GTHREAD_CFLAGS@ @GLIB_CFLAGS@
 
-test_common_LDFLAGS = -Wl,--export-dynamic
-
-test_sms_SOURCES = test-sms.c ../src/util.c ../src/smsutil.c
-
-test_sms_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ -ldl
-
-test_sms_LDFLAGS = -Wl,--export-dynamic
-
-AM_CFLAGS = @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
-		-DOFONO_API_SUBJECT_TO_CHANGE
-
-INCLUDES = -I$(top_builddir)/include -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/src
 
 MAINTAINERCLEANFILES = Makefile.in