diff --git a/Makefile b/Makefile
index 0237575f..42135c3b 100644
--- a/Makefile
+++ b/Makefile
@@ -39,16 +39,15 @@ install-stripped:
 	@$(MAKE) -C rem2html install
 	@$(MAKE) -C rem2pdf -f Makefile.top install INSTALL_BASE=$(INSTALL_BASE)
 
-test:
-	@$(MAKE) -C src -s all
-	@$(MAKE) -C src -s test
+test: test-basic test-tz
 
 test-tz:
 	@$(MAKE) -C src -s all
 	@$(MAKE) -C src -s test-tz
 
-test-all:
-	@$(MAKE) -C src -s test-all
+test-basic:
+	@$(MAKE) -C src -s all
+	@$(MAKE) -C src -s test-basic
 
 cppcheck:
 	@$(MAKE) -C src cppcheck
diff --git a/src/Makefile.in b/src/Makefile.in
index a28c9b95..d726df16 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -40,13 +40,14 @@ REMINDOBJS= $(REMINDSRCS:.c=.o) $(XLATSRC:.c=.o)
 
 all: remind rem2ps
 
-test: all
+test-basic: all
 	@sh ../tests/test-rem
 
 test-tz: all
 	@sh ../tests/test-timezone-support
 
-test-all: test test-tz
+test: test-basic test-tz
+
 .c.o:
 	@CC@ -c @CPPFLAGS@ @CFLAGS@ @DEFS@ $(CEXTRA) -DSYSDIR=$(datarootdir)/remind -I. -I$(srcdir) $<