diff --git a/ChangeLog b/ChangeLog
index 2cc9af4615085cdd2eda20dae528864fed1489fe..8269e6bd699029a063a6d584df2f3d700b28867d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2017-05-20  Niels Möller  <nisse@lysator.liu.se>
+
+	* testsuite/Makefile.in (test-rules): Use $(srddir)/-prefix for
+	.test-rules.make target, and change dependency from Makefile.in to
+	Makefile.
+
+2017-05-17  Nikos Mavrogiannopoulos  <nmav@redhat.com>
+
+	* testsuite/Makefile.in: Ensure .test-rules.make is regenerated
+	when Makefile.in is modified.
+
 2017-04-09  Niels Möller  <nisse@lysator.liu.se>
 
 	* testsuite/dlopen-test.c (main): Call dlclose, to fix memory leak
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 8f18f84a6d6a89eccac051d47994890765e7eace..cc8dea3a8021dae496c2ef23df729b11799ce43c 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -96,9 +96,9 @@ dlopen-test$(EXEEXT): dlopen-test.$(OBJEXT) testutils.$(OBJEXT)
 	$(LINK) dlopen-test.$(OBJEXT) -ldl -o dlopen-test$(EXEEXT)
 
 .PHONY: test-rules
-test-rules: .test-rules.make
+test-rules: $(srcdir)/.test-rules.make
 
-.test-rules.make: Makefile.in
+$(srcdir)/.test-rules.make: Makefile
 	(for f in $(TS_NETTLE) $(TS_HOGWEED) $(EXTRA_TARGETS) ; do \
 	  echo $$f'$$(EXEEXT): '$$f'.$$(OBJEXT)' ; \
 	  echo '	$$(LINK) '$$f'.$$(OBJEXT) $$(TEST_OBJS) -o '$$f'$$(EXEEXT)' ; \