diff --git a/test/Makefile.in b/test/Makefile.in
index 84ab4e70aee..4bcfee7bad5 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -245,13 +245,13 @@ endef
 $(foreach test,${TESTS},$(eval $(call test_template,${test})))
 
 ## Get the tests for only a specific directory.
-SUBDIRS = $(sort $(shell find lib-src lisp misc src -type d ! -path "*resources*" -print))
+SUBDIRS = $(sort $(shell cd ${srcdir} && find lib-src lisp misc src -type d ! -path "*resources*" -print))
 
 define subdir_template
   .PHONY: check-$(subst /,-,$(1))
   check-$(subst /,-,$(1)):
 	@${MAKE} check LOGFILES="$(patsubst %.el,%.log, \
-		$(patsubst $(srcdir)/%,%,$(wildcard $(1)/*.el)))"
+		$(patsubst $(srcdir)/%,%,$(wildcard ${srcdir}/$(1)/*.el)))"
 endef
 
 $(foreach subdir, $(SUBDIRS), $(eval $(call subdir_template,$(subdir))))