diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index f105c380ce54df97cf0a3b986f22f9d7134fcf6e..06823067bca972184b747d9a6379adc66e72fc66 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -183,7 +183,7 @@ if (((NR+1)%64) == 0) print NR+1," tests done"; }'
 test_verify:
 	@echo "The following command should have some OK's and some failures"
 	@echo "There are definitly a few expired certificates"
-	../apps/ssleay verify -CApath ../certs ../certs/*.pem
+	../apps/openssl verify -CApath ../certs ../certs/*.pem
 
 test_dh:
 	@echo "Generate as set of DH parameters"
diff --git a/test/tcrl b/test/tcrl
index 859fba452f51586a2a8b54f0ce056e06eb9f79cd..acaf8f3c47165ce17195346a72f132de48d0d165 100644
--- a/test/tcrl
+++ b/test/tcrl
@@ -3,7 +3,7 @@
 PATH=../apps:$PATH
 export PATH
 
-cmd='../apps/ssleay crl'
+cmd='../apps/openssl crl'
 
 if [ "$1"x != "x" ]; then
 	t=$1
diff --git a/test/testca b/test/testca
index a28402f9ca79fa2187d1c19b808066637d3c7cd0..88c186b6ab847772ba2ab63272f726ceb00ecdd7 100644
--- a/test/testca
+++ b/test/testca
@@ -23,7 +23,7 @@ if [ $? != 0 ]; then
 fi
 
 
-SSLEAY_CONFIG="-config ../apps/ssleay.cnf"
+SSLEAY_CONFIG="-config ../apps/openssl.cnf"
 export SSLEAY_CONFIG
 $SH ../apps/CA.sh -sign  <<EOF
 y
diff --git a/test/testenc b/test/testenc
index 42db56c2bea9c409cab4f15d0ee09b414e998b4e..f69ca37fc3efbdb3912fb06edafc2214c67ea1b2 100644
--- a/test/testenc
+++ b/test/testenc
@@ -2,7 +2,7 @@
 
 testsrc=Makefile.ssl
 test=./p
-cmd=../apps/ssleay
+cmd=../apps/openssl
 
 cat $testsrc >$test;
 
diff --git a/test/testgen b/test/testgen
index 12a4ca4cea89f24aaff47f4ec94634cd4567368c..f31586e2a46c6db1ee92d3a2051da08f2a6b9751 100644
--- a/test/testgen
+++ b/test/testgen
@@ -15,13 +15,13 @@ echo "There should be a 2 sequences of .'s and some +'s."
 echo "There should not be more that at most 80 per line"
 echo "This could take some time."
 
-../apps/ssleay req -config test.cnf -new -out testreq.pem
+../apps/openssl req -config test.cnf -new -out testreq.pem
 if [ $? != 0 ]; then
 echo problems creating request
 exit 1
 fi
 
-../apps/ssleay req -verify -in testreq.pem -noout
+../apps/openssl req -verify -in testreq.pem -noout
 if [ $? != 0 ]; then
 echo signature on req is wrong
 exit 1
diff --git a/test/testss b/test/testss
index a5aecf4694df891505bbebf0e6a00f9000e167b4..36c792251e259f4d747f499aa356c44240c1260d 100644
--- a/test/testss
+++ b/test/testss
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 digest='-mdc2'
-reqcmd="../apps/ssleay req"
-x509cmd="../apps/ssleay x509 $digest"
-verifycmd="../apps/ssleay verify"
+reqcmd="../apps/openssl req"
+x509cmd="../apps/openssl x509 $digest"
+verifycmd="../apps/openssl verify"
 
 CAkey="keyCA.ss"
 CAcert="certCA.ss"
diff --git a/test/tpkcs7 b/test/tpkcs7
index ea1f005dacfdc5a6fbc0ed8e9020acdbeaf849c5..15bbba42c051703bef72764d058e04f15116e0a9 100644
--- a/test/tpkcs7
+++ b/test/tpkcs7
@@ -3,7 +3,7 @@
 PATH=../apps:$PATH
 export PATH
 
-cmd='../apps/ssleay pkcs7'
+cmd='../apps/openssl pkcs7'
 
 if [ "$1"x != "x" ]; then
 	t=$1
diff --git a/test/tpkcs7d b/test/tpkcs7d
index c8f18fb09c19cac4b3fff30b52f6477f624d3c1c..46e5aa2bd6ec3f1cd2c05b81783cc749df7b862c 100644
--- a/test/tpkcs7d
+++ b/test/tpkcs7d
@@ -3,7 +3,7 @@
 PATH=../apps:$PATH
 export PATH
 
-cmd='../apps/ssleay pkcs7'
+cmd='../apps/openssl pkcs7'
 
 if [ "$1"x != "x" ]; then
 	t=$1
@@ -11,7 +11,7 @@ else
 	t=pkcs7-1.pem
 fi
 
-echo testing pkcs7 conversions
+echo "testing pkcs7 conversions (2)"
 cp $t fff.p
 
 echo "p -> d"
diff --git a/test/treq b/test/treq
index e5f1d8cc41fdc56f8eee25e267be3c460a9eb933..ef3c13274a743a3fc228bcf15bb4255a4b95a164 100644
--- a/test/treq
+++ b/test/treq
@@ -3,7 +3,7 @@
 PATH=../apps:$PATH
 export PATH
 
-cmd='../apps/ssleay req'
+cmd='../apps/openssl req'
 
 if [ "$1"x != "x" ]; then
 	t=$1
diff --git a/test/trsa b/test/trsa
index e5b8fe0448eb90ce8c3199780880db8ecf7e4b50..d6a4dd826d7be8c541b3e6a9bc0d98f8630c2f84 100644
--- a/test/trsa
+++ b/test/trsa
@@ -3,7 +3,7 @@
 PATH=../apps:$PATH
 export PATH
 
-cmd='../apps/ssleay rsa'
+cmd='../apps/openssl rsa'
 
 if [ "$1"x != "x" ]; then
 	t=$1
diff --git a/test/tsid b/test/tsid
index 8c7e9b1387bce2e37f62ff9eda7f204462bed98d..9e0854516ca359ea3828e14a45364378251c8e30 100644
--- a/test/tsid
+++ b/test/tsid
@@ -3,7 +3,7 @@
 PATH=../apps:$PATH
 export PATH
 
-cmd='../apps/ssleay sess_id'
+cmd='../apps/openssl sess_id'
 
 if [ "$1"x != "x" ]; then
 	t=$1
diff --git a/test/tx509 b/test/tx509
index f8d1f82cdd229e97ce06b7f9aa74065cc54cb25f..35169f3a4380547f35e83e5c0931e1558d2308c0 100644
--- a/test/tx509
+++ b/test/tx509
@@ -3,7 +3,7 @@
 PATH=../apps:$PATH
 export PATH
 
-cmd='../apps/ssleay x509'
+cmd='../apps/openssl x509'
 
 if [ "$1"x != "x" ]; then
 	t=$1