diff --git a/bin/tests/system/resolver/ns6/keygen.sh b/bin/tests/system/resolver/ns6/keygen.sh
index 9a0d7123da..2141a309c6 100644
--- a/bin/tests/system/resolver/ns6/keygen.sh
+++ b/bin/tests/system/resolver/ns6/keygen.sh
@@ -13,12 +13,15 @@
 
 . ../../conf.sh
 
+#
+# We use rsasha256 here to get a ZSK + KSK that don't fit in 512 bytes.
+#
 zone=ds.example.net
 zonefile="${zone}.db"
 infile="${zonefile}.in"
 cp $infile $zonefile
-ksk=`$KEYGEN -q -a rsasha256 -fk $zone`
-zsk=`$KEYGEN -q -a rsasha256 -b 2048 $zone`
+ksk=$($KEYGEN -q -a rsasha256 -fk $zone)
+zsk=$($KEYGEN -q -a rsasha256 -b 2048 $zone)
 cat $ksk.key $zsk.key >> $zonefile
 $SIGNER -P -o $zone $zonefile > /dev/null
 
@@ -26,8 +29,8 @@ zone=example.net
 zonefile="${zone}.db"
 infile="${zonefile}.in"
 cp $infile $zonefile
-ksk=`$KEYGEN -q -a rsasha256 -fk $zone`
-zsk=`$KEYGEN -q -a rsasha256 $zone`
+ksk=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -fk $zone)
+zsk=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} $zone)
 cat $ksk.key $zsk.key dsset-ds.example.net. >> $zonefile
 $SIGNER -P -o $zone $zonefile > /dev/null