diff --git a/testsuite/testutils.c b/testsuite/testutils.c
index dbd475548de30826008dd19f0896304768d4447a..68d27fc1713d4aaeb3913a921a081fb8779821d9 100644
--- a/testsuite/testutils.c
+++ b/testsuite/testutils.c
@@ -432,7 +432,7 @@ mpz_togglebit (mpz_t x, unsigned long int bit)
 }
 #endif /* HAVE_LIBGMP */
 
-#if WITH_PUBLIC_KEY
+#if WITH_HOGWEED
 #define SIGN(key, hash, msg, signature) do {	\
   hash##_update(&hash, LDATA(msg));		\
   rsa_##hash##_sign(key, &hash, signature);	\
@@ -825,5 +825,5 @@ test_dsa_key(struct dsa_public_key *pub,
   ASSERT(0 == mpz_cmp(t, pub->y));
 };
 
-#endif /* WITH_PUBLIC_KEY */
+#endif /* WITH_HOGWEED */
 
diff --git a/testsuite/testutils.h b/testsuite/testutils.h
index 426239b6bbca81b54ad3ff62d968c78fb38755fd..352e1e84a9e6e705cf14cb390d24617356816b52 100644
--- a/testsuite/testutils.h
+++ b/testsuite/testutils.h
@@ -15,7 +15,7 @@
 # include "bignum.h"
 #endif
 
-#if WITH_PUBLIC_KEY
+#if WITH_HOGWEED
 # include "rsa.h"
 # include "dsa.h"
 #endif
@@ -102,7 +102,7 @@ test_armor(const struct nettle_armor *armor,
            const uint8_t *data,
            const uint8_t *ascii);
 
-#if WITH_PUBLIC_KEY
+#if WITH_HOGWEED
 void
 test_rsa_set_key_1(struct rsa_public_key *pub,
 		   struct rsa_private_key *key);
@@ -134,7 +134,7 @@ void
 test_dsa_key(struct dsa_public_key *pub,
 	     struct dsa_private_key *key);
 
-#endif /* WITH_PUBLIC_KEY */
+#endif /* WITH_HOGWEED */
 
 #ifdef __cplusplus
 }