diff --git a/Makefile.am b/Makefile.am
index 60092bae..cf200646 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-SUBDIRS=test
 
 ##
 # Rofi the program
@@ -90,3 +89,41 @@ update-manpage: ${top_srcdir}/doc/rofi-manpage.markdown
 .PHONY: test
 test: rofi
 	make -C test/ test
+##
+# Rofi test program
+##
+noinst_PROGRAMS=rofi_test textbox_test helper_test
+
+
+rofi_test_SOURCES=\
+    source/history.c\
+    config/config.c\
+    include/rofi.h\
+    include/history.h\
+	test/history-test.c
+
+textbox_test_SOURCES=\
+    source/textbox.c\
+    config/config.c\
+    include/rofi.h\
+    include/textbox.h\
+	test/textbox-test.c
+
+helper_test_SOURCES=\
+    config/config.c\
+    include/rofi.h\
+    source/helper.c\
+    include/helper.h\
+    test/helper-test.c
+
+.PHONY: test
+test: ${bin_PROGRAMS} 
+	./rofi_test
+	./helper_test
+	$(top_srcdir)/test/run_test.sh 123 $(top_builddir)/textbox_test $(top_builddir) $(top_srcdir)/doc/example.xresources
+	$(top_srcdir)/test/run_test.sh 200 $(top_srcdir)/test/run_errormsg_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
+	$(top_srcdir)/test/run_test.sh 201 $(top_srcdir)/test/run_switchdialog_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
+	$(top_srcdir)/test/run_test.sh 202 $(top_srcdir)/test/run_dmenu_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
+	$(top_srcdir)/test/run_test.sh 203 $(top_srcdir)/test/run_dmenu_custom_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
+	$(top_srcdir)/test/run_test.sh 204 $(top_srcdir)/test/run_run_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
+	$(top_srcdir)/test/run_test.sh 205 $(top_srcdir)/test/run_script_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
diff --git a/configure.ac b/configure.ac
index 69411321..0f4d952b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,5 +53,5 @@ PKG_CHECK_MODULES([xinerama], [xinerama])
 PKG_CHECK_MODULES([pango], [pango pangoxft])
 
 
-AC_CONFIG_FILES([Makefile test/Makefile])
+AC_CONFIG_FILES([Makefile ])
 AC_OUTPUT
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 6823e837..00000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-##
-# Rofi the program
-##
-noinst_PROGRAMS=rofi_test textbox_test helper_test
-
-LIBS=\
-    @xft_LIBS@\
-    @x11_LIBS@\
-    @xinerama_LIBS@\
-	@pango_LIBS@
-
-AM_CFLAGS=\
-    @xft_CFLAGS@\
-    @x11_CFLAGS@\
-    @xinerama_CFLAGS@\
-    @pango_CFLAGS@\
-    -DMANPAGE_PATH="\"$(mandir)/man1/rofi.1\""\
-    -I$(top_srcdir)/include/\
-    -I$(top_srcdir)/config/\
-    -I$(top_builddir)/
-
-rofi_test_SOURCES=\
-    ../source/history.c\
-    ../config/config.c\
-    ../include/rofi.h\
-    ../include/history.h\
-	history-test.c
-
-textbox_test_SOURCES=\
-    ../source/textbox.c\
-    ../config/config.c\
-    ../include/rofi.h\
-    ../include/textbox.h\
-	textbox-test.c
-
-helper_test_SOURCES=\
-    ../config/config.c\
-    ../include/rofi.h\
-    ../source/helper.c\
-    ../include/helper.h\
-    helper-test.c
-
-.PHONY: test
-test: ${bin_PROGRAMS} 
-	./rofi_test
-	./helper_test
-	$(top_srcdir)/test/run_test.sh 123 $(top_builddir)/test/textbox_test $(top_builddir) $(top_srcdir)/doc/example.xresources
-	$(top_srcdir)/test/run_test.sh 200 $(top_srcdir)/test/run_errormsg_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
-	$(top_srcdir)/test/run_test.sh 201 $(top_srcdir)/test/run_switchdialog_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
-	$(top_srcdir)/test/run_test.sh 202 $(top_srcdir)/test/run_dmenu_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
-	$(top_srcdir)/test/run_test.sh 203 $(top_srcdir)/test/run_dmenu_custom_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
-	$(top_srcdir)/test/run_test.sh 204 $(top_srcdir)/test/run_run_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
-	$(top_srcdir)/test/run_test.sh 205 $(top_srcdir)/test/run_script_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources