diff --git a/build.sh b/build.sh
index 9338caf..c4c209f 100755
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,7 @@ make clean 1>/dev/null 2>/dev/null
 
 echo -n "building..."
 
-CFLAGS="$2 $CFLAGS $4" EXTRALIBS="$5" make -f $3 test tv_gen 1>gcc_1.txt 2>gcc_2.txt
+CFLAGS="$2 $CFLAGS $4" EXTRALIBS="$5" make -f $3 all_test 1>gcc_1.txt 2>gcc_2.txt
 mret=$?
 cnt=$(wc -l < gcc_2.txt)
 # ignore 2 lines since ar prints to stderr instead of stdout and ar is called for 
diff --git a/makefile b/makefile
index e3c43b6..9a79f62 100644
--- a/makefile
+++ b/makefile
@@ -251,7 +251,7 @@ endef
 
 $(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo))))
 
-
+all_test: test tv_gen $(DEMOS)
 
 #This rule installs the library and the header files. This must be run
 #as root in order to have a high enough permission to write to the correct
diff --git a/makefile.icc b/makefile.icc
index 18143ee..9cec4ef 100644
--- a/makefile.icc
+++ b/makefile.icc
@@ -308,6 +308,8 @@ timing: library $(TIMINGS) testprof/$(LIBTEST)
 test: library $(TESTS) testprof/$(LIBTEST)
 	$(CC) $(TESTS) testprof/$(LIBTEST) $(LIBNAME) $(EXTRALIBS) -o $(TEST)
 
+all_test: test tv_gen hashsum crypt small timing
+
 #This rule installs the library and the header files. This must be run
 #as root in order to have a high enough permission to write to the correct
 #directories and to set the owner and group to root.
diff --git a/makefile.mingw b/makefile.mingw
index 68e80b5..4205b29 100644
--- a/makefile.mingw
+++ b/makefile.mingw
@@ -246,6 +246,8 @@ timing: library testprof/$(LIBTEST) $(TIMINGS)
 test: library testprof/$(LIBTEST) $(TESTS)
 	$(CC) $(LDFLAGS) $(TESTS) testprof/$(LIBTEST) $(LIBNAME) $(EXTRALIBS) -o $(TEST)
 
+all_test: test tv_gen hashsum crypt small multi timing
+
 install: library
 	cmd /c if not exist "$(DESTDIR)$(LIBPATH)" mkdir "$(DESTDIR)$(LIBPATH)"
 	cmd /c if not exist "$(DESTDIR)$(INCPATH)" mkdir "$(DESTDIR)$(INCPATH)"
diff --git a/makefile.msvc b/makefile.msvc
index 7c060ce..5d97aec 100644
--- a/makefile.msvc
+++ b/makefile.msvc
@@ -168,6 +168,8 @@ test: demos/test.c library
 timing: demos/timing.c library
 	cl $(CFLAGS) demos/timing.c testprof/tomcrypt_prof.lib tomcrypt.lib advapi32.lib $(EXTRALIBS)
 
+all_test: test tv_gen hashsum timing
+
 # $Source$
 # $Revision$
 # $Date$
diff --git a/makefile.shared b/makefile.shared
index a0d90ac..4222bd3 100644
--- a/makefile.shared
+++ b/makefile.shared
@@ -244,6 +244,8 @@ test: library testprof/$(LIBTEST) $(TESTS)
 timing: library testprof/$(LIBTEST) $(TIMINGS)
 	$(LT) --mode=link --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TIMING) $(TIMINGS) testprof/$(LIBTEST) $(LIBNAME) $(EXTRALIBS)
 
+all_test: test tv_gen hashsum crypt small timing
+
 # $Source$
 # $Revision$
 # $Date$
diff --git a/makefile.unix b/makefile.unix
index 6c6461b..87ad822 100644
--- a/makefile.unix
+++ b/makefile.unix
@@ -246,6 +246,8 @@ timing: library testprof/$(LIBTEST) $(TIMINGS)
 test: library testprof/$(LIBTEST) $(TESTS)
 	$(CC) $(LDFLAGS) $(TESTS) testprof/$(LIBTEST) $(LIBNAME) $(EXTRALIBS) -o $(TEST)
 
+all_test: test tv_gen hashsum crypt small multi timing
+
 #This rule installs the library and the header files. This must be run
 #as root in order to have a high enough permission to write to the correct
 #directories and to set the owner and group to root.