diff --git a/Makefile.in b/Makefile.in
index 2b924c59..1e0cd3d1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -97,16 +97,16 @@ doc:	FORCE
 example:
 	cd spec/example && $(MAKE) $@
 
-test:
+test: default
 	cd src && $(MAKE) $@
 
-getdns_query:
+getdns_query: default
 	cd src && $(MAKE) $@
 
-stubby:
+stubby: getdns_query
 	cd src && $(MAKE) $@
 
-scratchpad:
+scratchpad: default
 	cd src && $(MAKE) $@
 
 pad: scratchpad
diff --git a/src/Makefile.in b/src/Makefile.in
index c1cb8f12..2342e250 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -157,16 +157,16 @@ libgetdns_ext_ev.la: libgetdns.la libev.lo
 libgetdns.la: $(GETDNS_OBJ) version.lo context.lo $(DEFAULT_EVENTLOOP_OBJ) $(GLDNS_OBJ) $(COMPAT_OBJ) $(UTIL_OBJ) $(JSMN_OBJ)
 	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(GETDNS_OBJ) version.lo context.lo $(DEFAULT_EVENTLOOP_OBJ) $(GLDNS_OBJ) $(COMPAT_OBJ) $(UTIL_OBJ) $(JSMN_OBJ) $(LDFLAGS) -rpath $(libdir) -version-info $(libversion) -no-undefined -export-symbols $(srcdir)/libgetdns.symbols
 
-test:	all
+test: default
 	cd test && $(MAKE) $@
 
-getdns_query:	all
+getdns_query: default
 	cd tools && $(MAKE) $@
 
-stubby:	all
+stubby:	getdns_query
 	cd tools && $(MAKE) $@
 
-scratchpad:	all
+scratchpad: default
 	cd test && $(MAKE) $@
 
 pad: scratchpad