diff --git a/ChangeLog b/ChangeLog
index b01c8b4d9dbeb92d3c4a9b07742a8df171c5ef62..eb3c43d54be07338499c51823825006bb97fe458 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-02-18  Niels Möller  <nisse@lysator.liu.se>
+
+	Backported from master branch.
+	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Moved pss-mgf1-test.c...
+	(TS_HOGWEED_SOURCES): ...to here. Fixes link failure in builds
+	without public-key support.
+
 2018-01-16  Niels Möller  <nisse@lysator.liu.se>
 
 	Backported from master branch.
diff --git a/testsuite/.test-rules.make b/testsuite/.test-rules.make
index 1f78031031042abfc5395aa330d95f1bd571eb17..12c39f3054950fe2df134e947f5a9e7b3bae144b 100644
--- a/testsuite/.test-rules.make
+++ b/testsuite/.test-rules.make
@@ -163,9 +163,6 @@ yarrow-test$(EXEEXT): yarrow-test.$(OBJEXT)
 pbkdf2-test$(EXEEXT): pbkdf2-test.$(OBJEXT)
 	$(LINK) pbkdf2-test.$(OBJEXT) $(TEST_OBJS) -o pbkdf2-test$(EXEEXT)
 
-pss-mgf1-test$(EXEEXT): pss-mgf1-test.$(OBJEXT)
-	$(LINK) pss-mgf1-test.$(OBJEXT) $(TEST_OBJS) -o pss-mgf1-test$(EXEEXT)
-
 sexp-test$(EXEEXT): sexp-test.$(OBJEXT)
 	$(LINK) sexp-test.$(OBJEXT) $(TEST_OBJS) -o sexp-test$(EXEEXT)
 
@@ -193,6 +190,9 @@ pss-test$(EXEEXT): pss-test.$(OBJEXT)
 rsa-sign-tr-test$(EXEEXT): rsa-sign-tr-test.$(OBJEXT)
 	$(LINK) rsa-sign-tr-test.$(OBJEXT) $(TEST_OBJS) -o rsa-sign-tr-test$(EXEEXT)
 
+pss-mgf1-test$(EXEEXT): pss-mgf1-test.$(OBJEXT)
+	$(LINK) pss-mgf1-test.$(OBJEXT) $(TEST_OBJS) -o pss-mgf1-test$(EXEEXT)
+
 rsa-pss-sign-tr-test$(EXEEXT): rsa-pss-sign-tr-test.$(OBJEXT)
 	$(LINK) rsa-pss-sign-tr-test.$(OBJEXT) $(TEST_OBJS) -o rsa-pss-sign-tr-test$(EXEEXT)
 
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 3117d66def795717733a775482c9c6642418be2d..df1c81508656a603ad6fbdea9bc9ef830f6ebe31 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -30,13 +30,13 @@ TS_NETTLE_SOURCES = aes-test.c arcfour-test.c arctwo-test.c \
 		    hmac-test.c umac-test.c \
 		    meta-hash-test.c meta-cipher-test.c\
 		    meta-aead-test.c meta-armor-test.c \
-		    buffer-test.c yarrow-test.c pbkdf2-test.c pss-mgf1-test.c
+		    buffer-test.c yarrow-test.c pbkdf2-test.c
 
 TS_HOGWEED_SOURCES = sexp-test.c sexp-format-test.c \
 		     rsa2sexp-test.c sexp2rsa-test.c \
 		     bignum-test.c random-prime-test.c \
 		     pkcs1-test.c pss-test.c rsa-sign-tr-test.c \
-		     rsa-pss-sign-tr-test.c \
+		     pss-mgf1-test.c rsa-pss-sign-tr-test.c \
 		     rsa-test.c rsa-encrypt-test.c rsa-keygen-test.c \
 		     dsa-test.c dsa-keygen-test.c \
 		     curve25519-dh-test.c \