RSA_CERT=$srcdir/../certs/cert-rsa-2432.pem
RSA_KEY=$srcdir/../certs/rsa-2432.pem
-CA_CERT=$srcdir/../../doc/credentials/x509-ca.pem
-CLI_CERT=$srcdir/../../doc/credentials/x509-client.pem
-CLI_KEY=$srcdir/../../doc/credentials/x509-client-key.pem
+CA_CERT=$srcdir/../../doc/credentials/x509/ca.pem
+CLI_CERT=$srcdir/../../doc/credentials/x509/clicert.pem
+CLI_KEY=$srcdir/../../doc/credentials/x509/clikey.pem
CA_ECC_CERT=$srcdir/../certs/ca-cert-ecc.pem
ECC_CERT=$srcdir/../certs/cert-ecc.pem
ECC_KEY=$srcdir/../certs/ecc.pem
-SERV_CERT=$srcdir/../../doc/credentials/x509-server.pem
-SERV_KEY=$srcdir/../../doc/credentials/x509-server-key.pem
-SERV_DSA_CERT=$srcdir/../../doc/credentials/x509-server-dsa.pem
-SERV_DSA_KEY=$srcdir/../../doc/credentials/x509-server-key-dsa.pem
+SERV_CERT=$srcdir/../../doc/credentials/x509/cert-rsa.pem
+SERV_KEY=$srcdir/../../doc/credentials/x509/key-rsa.pem
+SERV_DSA_CERT=$srcdir/../../doc/credentials/x509/cert-dsa.pem
+SERV_DSA_KEY=$srcdir/../../doc/credentials/x509/key-dsa.pem
echo "#####################"
echo "# Client mode tests #"