diff --git a/Makefile.am b/Makefile.am
index dc4ee612..beaf999f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = doc include libntfs ntfsprogs test
+SUBDIRS = doc include libntfs ntfsprogs
 
 EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.libntfs ChangeLog \
 		INSTALL NEWS README autogen.sh ntfsprogs.spec.in \
@@ -8,7 +8,7 @@ EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.libntfs ChangeLog \
 AUTOMAKE_OPTIONS = gnu
 
 MAINTAINERCLEANFILES = configure Makefile.in aclocal.m4 compile depcomp \
-	install-sh missing config.guess config.sub config.h.in INSTALL
+	install-sh ltmain.sh missing config.guess config.sub config.h.in INSTALL
 
 dist-hook: ntfsprogs.spec
 	cp ntfsprogs.spec $(distdir)
@@ -30,6 +30,7 @@ extras: libs
 if ENABLE_TEST
 test:	libs
 	(cd test && $(MAKE) all test) || exit 1;
+SUBDIRS += test
 else
 .PHONY: test
 test:
diff --git a/test/Makefile.am b/test/Makefile.am
index 9c7f9daf..ba3e615c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -38,9 +38,6 @@ test:	$(TEST_RUNLIST) testz testp testf
 testz:	$(TEST_RUNLIST)
 	@$(TEST_VALGRIND) $(TEST_RUNLIST) zero > zero
 	@diff -qs {runlist-data/,}zero
-	@echo
-	@echo Success
-	@echo
 
 testp:	$(TEST_RUNLIST)
 	@for i in contig noncontig; do						\
@@ -49,19 +46,13 @@ testp:	$(TEST_RUNLIST)
 			L2=`echo $$j | cut -b1`;				\
 			FILE=pure-$$L1$$L2;					\
 			$(TEST_VALGRIND) $(TEST_RUNLIST) pure $$i $$j > $$FILE;	\
-			diff -qs {runlist-data/,}$$FILE;				\
+			diff -qs {runlist-data/,}$$FILE;			\
 		done;								\
 	done
-	@echo
-	@echo Success
-	@echo
 
 testf:	$(TEST_RUNLIST)
 	@for i in 123 132 213 231 312 321; do					\
 		$(TEST_VALGRIND) $(TEST_RUNLIST) frag $$i > frag$$i;		\
-		diff -qs {runlist-data/,}frag$$i;					\
+		diff -qs {runlist-data/,}frag$$i;				\
 	done
-	@echo
-	@echo Success
-	@echo