diff --git a/src/testsuite/keygen-1-test b/src/testsuite/keygen-1-test
index 914a684cf42413eca485f54871cb88da40153e77..4efa8085b763fbc179d71ffaaafc2ebb14288fbc 100755
--- a/src/testsuite/keygen-1-test
+++ b/src/testsuite/keygen-1-test
@@ -11,5 +11,5 @@ fi
 . $srcdir/functions.sh
 
 rm -f foo foo.pub
-../lsh-keygen -a dsa -l2 | ../lsh-writekey -o foo \
+../lsh-keygen -a dsa -l2 | ../lsh-writekey -c none -o foo \
   && "$SEXP_CONV" < foo && [ -s foo -a -s foo.pub ] && test_success
diff --git a/src/testsuite/keygen-2-test b/src/testsuite/keygen-2-test
index 2e238241e110d8685938e8c3109e8c4c356b3809..4131105544e71e8464b5749645388ec7ce0194be 100755
--- a/src/testsuite/keygen-2-test
+++ b/src/testsuite/keygen-2-test
@@ -11,5 +11,5 @@ fi
 . $srcdir/functions.sh
 
 rm -f foo foo.pub
-../lsh-keygen -a rsa -l 777 | ../lsh-writekey -o foo \
+../lsh-keygen -a rsa -l 777 | ../lsh-writekey -c none -o foo \
   && "$SEXP_CONV" < foo && [ -s foo -a -s foo.pub ] && test_success
diff --git a/src/testsuite/lsh-decrypt-key-test b/src/testsuite/lsh-decrypt-key-test
index de59c0065ef4d178123ff08ee1aa140866d5cd88..e6419299c7d5f91a3d3d742e810b7dbd81e1840c 100755
--- a/src/testsuite/lsh-decrypt-key-test
+++ b/src/testsuite/lsh-decrypt-key-test
@@ -26,7 +26,7 @@ chmod u+rx $fname
 
 ../lsh-keygen > $keyname.origkey 
 ../lsh-writekey -o $keyname -caes256-cbc -pbar <$keyname.origkey || test_fail
-../lsh-writekey -o $keyname.nevercrypted <$keyname.origkey || test_fail
+../lsh-writekey -o $keyname.nevercrypted -c none <$keyname.origkey || test_fail
 
 ../lsh-decrypt-key --in=$keyname --out=$keyname.decrypted --askpass=$fname || test_fail
 
diff --git a/src/testsuite/setup-env b/src/testsuite/setup-env
index d0ddd8a7a8087378a11db8c1396dba37067f0bbf..91f92ece16d100ef99277b4c87f2a204336a607c 100755
--- a/src/testsuite/setup-env
+++ b/src/testsuite/setup-env
@@ -17,7 +17,7 @@ echo "Creating seed file"
 ../lsh-make-seed -q --sloppy
 
 echo "Creating identity.pub for tests"
-../lsh-keygen -a dsa -l2 | ../lsh-writekey
+../lsh-keygen -a dsa -l2 | ../lsh-writekey -c none
 
 echo "Authorizing key for login"
 "$srcdir/../lsh-authorize" "$HOME/.lsh/identity.pub"
diff --git a/src/testsuite/write-key-1-test b/src/testsuite/write-key-1-test
index a6d11e5ef3dffb5ca9b7fbaa10dec5a97463fa78..312d725fadd5dd9c98ce9ad69e26ec389f00e00c 100755
--- a/src/testsuite/write-key-1-test
+++ b/src/testsuite/write-key-1-test
@@ -11,4 +11,4 @@ fi
 . $srcdir/functions.sh
 
 rm -f foo foo.pub
-../lsh-writekey -o foo < $srcdir/key-1.private && [ -s foo -a -s foo.pub ] && test_success
+../lsh-writekey -c none -o foo < $srcdir/key-1.private && [ -s foo -a -s foo.pub ] && test_success
diff --git a/src/testsuite/write-key-2-test b/src/testsuite/write-key-2-test
index a2b17d2eea4ee95b92ac53f0c1e1837999404164..52384389024983105f9b5235c97c8e984db27647 100755
--- a/src/testsuite/write-key-2-test
+++ b/src/testsuite/write-key-2-test
@@ -11,5 +11,5 @@ fi
 . $srcdir/functions.sh
 
 rm -rf temphome && mkdir temphome
-HOME="`pwd`/temphome" ../lsh-writekey < $srcdir/key-1.private \
+HOME="`pwd`/temphome" ../lsh-writekey -c none < $srcdir/key-1.private \
   && [ -s "temphome/.lsh/identity" -a -s "temphome/.lsh/identity.pub" ] && test_success