diff --git a/testing/tests/openssl/ikev1-alg-ecp-high/description.txt b/testing/tests/openssl-ikev1/alg-ecp-high/description.txt
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-high/description.txt
rename to testing/tests/openssl-ikev1/alg-ecp-high/description.txt
diff --git a/testing/tests/openssl/ikev1-alg-ecp-high/evaltest.dat b/testing/tests/openssl-ikev1/alg-ecp-high/evaltest.dat
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-high/evaltest.dat
rename to testing/tests/openssl-ikev1/alg-ecp-high/evaltest.dat
diff --git a/testing/tests/openssl/ikev1-alg-ecp-high/hosts/carol/etc/ipsec.conf b/testing/tests/openssl-ikev1/alg-ecp-high/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-high/hosts/carol/etc/ipsec.conf
rename to testing/tests/openssl-ikev1/alg-ecp-high/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-high/hosts/carol/etc/strongswan.conf b/testing/tests/openssl-ikev1/alg-ecp-high/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-high/hosts/carol/etc/strongswan.conf
rename to testing/tests/openssl-ikev1/alg-ecp-high/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-high/hosts/dave/etc/ipsec.conf b/testing/tests/openssl-ikev1/alg-ecp-high/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-high/hosts/dave/etc/ipsec.conf
rename to testing/tests/openssl-ikev1/alg-ecp-high/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-high/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev1/alg-ecp-high/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-high/hosts/dave/etc/strongswan.conf
rename to testing/tests/openssl-ikev1/alg-ecp-high/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-high/hosts/moon/etc/ipsec.conf b/testing/tests/openssl-ikev1/alg-ecp-high/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-high/hosts/moon/etc/ipsec.conf
rename to testing/tests/openssl-ikev1/alg-ecp-high/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-high/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev1/alg-ecp-high/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-high/hosts/moon/etc/strongswan.conf
rename to testing/tests/openssl-ikev1/alg-ecp-high/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl/alg-blowfish/posttest.dat b/testing/tests/openssl-ikev1/alg-ecp-high/posttest.dat
similarity index 100%
rename from testing/tests/openssl/alg-blowfish/posttest.dat
rename to testing/tests/openssl-ikev1/alg-ecp-high/posttest.dat
diff --git a/testing/tests/openssl/alg-blowfish/pretest.dat b/testing/tests/openssl-ikev1/alg-ecp-high/pretest.dat
similarity index 100%
rename from testing/tests/openssl/alg-blowfish/pretest.dat
rename to testing/tests/openssl-ikev1/alg-ecp-high/pretest.dat
diff --git a/testing/tests/openssl/alg-blowfish/test.conf b/testing/tests/openssl-ikev1/alg-ecp-high/test.conf
similarity index 100%
rename from testing/tests/openssl/alg-blowfish/test.conf
rename to testing/tests/openssl-ikev1/alg-ecp-high/test.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-low/description.txt b/testing/tests/openssl-ikev1/alg-ecp-low/description.txt
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-low/description.txt
rename to testing/tests/openssl-ikev1/alg-ecp-low/description.txt
diff --git a/testing/tests/openssl/ikev1-alg-ecp-low/evaltest.dat b/testing/tests/openssl-ikev1/alg-ecp-low/evaltest.dat
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-low/evaltest.dat
rename to testing/tests/openssl-ikev1/alg-ecp-low/evaltest.dat
diff --git a/testing/tests/openssl/ikev1-alg-ecp-low/hosts/carol/etc/ipsec.conf b/testing/tests/openssl-ikev1/alg-ecp-low/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-low/hosts/carol/etc/ipsec.conf
rename to testing/tests/openssl-ikev1/alg-ecp-low/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-low/hosts/carol/etc/strongswan.conf b/testing/tests/openssl-ikev1/alg-ecp-low/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-low/hosts/carol/etc/strongswan.conf
rename to testing/tests/openssl-ikev1/alg-ecp-low/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-low/hosts/dave/etc/ipsec.conf b/testing/tests/openssl-ikev1/alg-ecp-low/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-low/hosts/dave/etc/ipsec.conf
rename to testing/tests/openssl-ikev1/alg-ecp-low/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-low/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev1/alg-ecp-low/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-low/hosts/dave/etc/strongswan.conf
rename to testing/tests/openssl-ikev1/alg-ecp-low/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-low/hosts/moon/etc/ipsec.conf b/testing/tests/openssl-ikev1/alg-ecp-low/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-low/hosts/moon/etc/ipsec.conf
rename to testing/tests/openssl-ikev1/alg-ecp-low/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-low/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev1/alg-ecp-low/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-low/hosts/moon/etc/strongswan.conf
rename to testing/tests/openssl-ikev1/alg-ecp-low/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl/ecdsa-certs/posttest.dat b/testing/tests/openssl-ikev1/alg-ecp-low/posttest.dat
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/posttest.dat
rename to testing/tests/openssl-ikev1/alg-ecp-low/posttest.dat
diff --git a/testing/tests/openssl/ecdsa-certs/pretest.dat b/testing/tests/openssl-ikev1/alg-ecp-low/pretest.dat
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/pretest.dat
rename to testing/tests/openssl-ikev1/alg-ecp-low/pretest.dat
diff --git a/testing/tests/openssl/ecdsa-certs/test.conf b/testing/tests/openssl-ikev1/alg-ecp-low/test.conf
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/test.conf
rename to testing/tests/openssl-ikev1/alg-ecp-low/test.conf
diff --git a/testing/tests/openssl/rw-cert-ikev1/description.txt b/testing/tests/openssl-ikev1/rw-cert/description.txt
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev1/description.txt
rename to testing/tests/openssl-ikev1/rw-cert/description.txt
diff --git a/testing/tests/openssl/rw-cert-ikev1/evaltest.dat b/testing/tests/openssl-ikev1/rw-cert/evaltest.dat
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev1/evaltest.dat
rename to testing/tests/openssl-ikev1/rw-cert/evaltest.dat
diff --git a/testing/tests/openssl/rw-cert-ikev1/hosts/carol/etc/ipsec.conf b/testing/tests/openssl-ikev1/rw-cert/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev1/hosts/carol/etc/ipsec.conf
rename to testing/tests/openssl-ikev1/rw-cert/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/openssl/rw-cert-ikev1/hosts/carol/etc/strongswan.conf b/testing/tests/openssl-ikev1/rw-cert/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev1/hosts/carol/etc/strongswan.conf
rename to testing/tests/openssl-ikev1/rw-cert/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl/rw-cert-ikev1/hosts/dave/etc/ipsec.conf b/testing/tests/openssl-ikev1/rw-cert/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev1/hosts/dave/etc/ipsec.conf
rename to testing/tests/openssl-ikev1/rw-cert/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/openssl/rw-cert-ikev1/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev1/rw-cert/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev1/hosts/dave/etc/strongswan.conf
rename to testing/tests/openssl-ikev1/rw-cert/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl/rw-cert-ikev1/hosts/moon/etc/ipsec.conf b/testing/tests/openssl-ikev1/rw-cert/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev1/hosts/moon/etc/ipsec.conf
rename to testing/tests/openssl-ikev1/rw-cert/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/openssl/rw-cert-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev1/rw-cert/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev1/hosts/moon/etc/strongswan.conf
rename to testing/tests/openssl-ikev1/rw-cert/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-high/posttest.dat b/testing/tests/openssl-ikev1/rw-cert/posttest.dat
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-high/posttest.dat
rename to testing/tests/openssl-ikev1/rw-cert/posttest.dat
diff --git a/testing/tests/openssl/ikev1-alg-ecp-high/pretest.dat b/testing/tests/openssl-ikev1/rw-cert/pretest.dat
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-high/pretest.dat
rename to testing/tests/openssl-ikev1/rw-cert/pretest.dat
diff --git a/testing/tests/openssl/ikev1-alg-ecp-high/test.conf b/testing/tests/openssl-ikev1/rw-cert/test.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-high/test.conf
rename to testing/tests/openssl-ikev1/rw-cert/test.conf
diff --git a/testing/tests/openssl/alg-blowfish/description.txt b/testing/tests/openssl-ikev2/alg-blowfish/description.txt
similarity index 100%
rename from testing/tests/openssl/alg-blowfish/description.txt
rename to testing/tests/openssl-ikev2/alg-blowfish/description.txt
diff --git a/testing/tests/openssl/alg-blowfish/evaltest.dat b/testing/tests/openssl-ikev2/alg-blowfish/evaltest.dat
similarity index 100%
rename from testing/tests/openssl/alg-blowfish/evaltest.dat
rename to testing/tests/openssl-ikev2/alg-blowfish/evaltest.dat
diff --git a/testing/tests/openssl/alg-blowfish/hosts/carol/etc/ipsec.conf b/testing/tests/openssl-ikev2/alg-blowfish/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/alg-blowfish/hosts/carol/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/alg-blowfish/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/openssl/alg-blowfish/hosts/carol/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-blowfish/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/alg-blowfish/hosts/carol/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/alg-blowfish/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl/alg-blowfish/hosts/dave/etc/ipsec.conf b/testing/tests/openssl-ikev2/alg-blowfish/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/alg-blowfish/hosts/dave/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/alg-blowfish/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/openssl/alg-blowfish/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-blowfish/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/alg-blowfish/hosts/dave/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/alg-blowfish/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl/alg-blowfish/hosts/moon/etc/ipsec.conf b/testing/tests/openssl-ikev2/alg-blowfish/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/alg-blowfish/hosts/moon/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/alg-blowfish/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/openssl/alg-blowfish/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-blowfish/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/alg-blowfish/hosts/moon/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/alg-blowfish/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl/ikev1-alg-ecp-low/posttest.dat b/testing/tests/openssl-ikev2/alg-blowfish/posttest.dat
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-low/posttest.dat
rename to testing/tests/openssl-ikev2/alg-blowfish/posttest.dat
diff --git a/testing/tests/openssl/ikev1-alg-ecp-low/pretest.dat b/testing/tests/openssl-ikev2/alg-blowfish/pretest.dat
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-low/pretest.dat
rename to testing/tests/openssl-ikev2/alg-blowfish/pretest.dat
diff --git a/testing/tests/openssl/ikev1-alg-ecp-low/test.conf b/testing/tests/openssl-ikev2/alg-blowfish/test.conf
similarity index 100%
rename from testing/tests/openssl/ikev1-alg-ecp-low/test.conf
rename to testing/tests/openssl-ikev2/alg-blowfish/test.conf
diff --git a/testing/tests/openssl/ikev2-alg-ecp-high/description.txt b/testing/tests/openssl-ikev2/alg-ecp-high/description.txt
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-high/description.txt
rename to testing/tests/openssl-ikev2/alg-ecp-high/description.txt
diff --git a/testing/tests/openssl/ikev2-alg-ecp-high/evaltest.dat b/testing/tests/openssl-ikev2/alg-ecp-high/evaltest.dat
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-high/evaltest.dat
rename to testing/tests/openssl-ikev2/alg-ecp-high/evaltest.dat
diff --git a/testing/tests/openssl/ikev2-alg-ecp-high/hosts/carol/etc/ipsec.conf b/testing/tests/openssl-ikev2/alg-ecp-high/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-high/hosts/carol/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/alg-ecp-high/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/carol/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-ecp-high/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/carol/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/alg-ecp-high/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl/ikev2-alg-ecp-high/hosts/dave/etc/ipsec.conf b/testing/tests/openssl-ikev2/alg-ecp-high/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-high/hosts/dave/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/alg-ecp-high/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/openssl/ikev2-alg-ecp-high/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-ecp-high/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-high/hosts/dave/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/alg-ecp-high/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl/ikev2-alg-ecp-high/hosts/moon/etc/ipsec.conf b/testing/tests/openssl-ikev2/alg-ecp-high/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-high/hosts/moon/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/alg-ecp-high/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-ecp-high/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/dave/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/alg-ecp-high/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl/ikev2-alg-ecp-high/posttest.dat b/testing/tests/openssl-ikev2/alg-ecp-high/posttest.dat
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-high/posttest.dat
rename to testing/tests/openssl-ikev2/alg-ecp-high/posttest.dat
diff --git a/testing/tests/openssl/ikev2-alg-ecp-high/pretest.dat b/testing/tests/openssl-ikev2/alg-ecp-high/pretest.dat
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-high/pretest.dat
rename to testing/tests/openssl-ikev2/alg-ecp-high/pretest.dat
diff --git a/testing/tests/openssl/ikev2-alg-ecp-high/test.conf b/testing/tests/openssl-ikev2/alg-ecp-high/test.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-high/test.conf
rename to testing/tests/openssl-ikev2/alg-ecp-high/test.conf
diff --git a/testing/tests/openssl/ikev2-alg-ecp-low/description.txt b/testing/tests/openssl-ikev2/alg-ecp-low/description.txt
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-low/description.txt
rename to testing/tests/openssl-ikev2/alg-ecp-low/description.txt
diff --git a/testing/tests/openssl/ikev2-alg-ecp-low/evaltest.dat b/testing/tests/openssl-ikev2/alg-ecp-low/evaltest.dat
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-low/evaltest.dat
rename to testing/tests/openssl-ikev2/alg-ecp-low/evaltest.dat
diff --git a/testing/tests/openssl/ikev2-alg-ecp-low/hosts/carol/etc/ipsec.conf b/testing/tests/openssl-ikev2/alg-ecp-low/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-low/hosts/carol/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/alg-ecp-low/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-ecp-low/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/moon/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/alg-ecp-low/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl/ikev2-alg-ecp-low/hosts/dave/etc/ipsec.conf b/testing/tests/openssl-ikev2/alg-ecp-low/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-low/hosts/dave/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/alg-ecp-low/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/openssl/ikev2-alg-ecp-low/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-ecp-low/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-low/hosts/dave/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/alg-ecp-low/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl/ikev2-alg-ecp-low/hosts/moon/etc/ipsec.conf b/testing/tests/openssl-ikev2/alg-ecp-low/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-low/hosts/moon/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/alg-ecp-low/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/openssl/ikev2-alg-ecp-high/hosts/carol/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-ecp-low/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-high/hosts/carol/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/alg-ecp-low/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl/ikev2-alg-ecp-low/posttest.dat b/testing/tests/openssl-ikev2/alg-ecp-low/posttest.dat
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-low/posttest.dat
rename to testing/tests/openssl-ikev2/alg-ecp-low/posttest.dat
diff --git a/testing/tests/openssl/ikev2-alg-ecp-low/pretest.dat b/testing/tests/openssl-ikev2/alg-ecp-low/pretest.dat
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-low/pretest.dat
rename to testing/tests/openssl-ikev2/alg-ecp-low/pretest.dat
diff --git a/testing/tests/openssl/ikev2-alg-ecp-low/test.conf b/testing/tests/openssl-ikev2/alg-ecp-low/test.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-low/test.conf
rename to testing/tests/openssl-ikev2/alg-ecp-low/test.conf
diff --git a/testing/tests/openssl/ecdsa-certs/description.txt b/testing/tests/openssl-ikev2/ecdsa-certs/description.txt
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/description.txt
rename to testing/tests/openssl-ikev2/ecdsa-certs/description.txt
diff --git a/testing/tests/openssl/ecdsa-certs/evaltest.dat b/testing/tests/openssl-ikev2/ecdsa-certs/evaltest.dat
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/evaltest.dat
rename to testing/tests/openssl-ikev2/ecdsa-certs/evaltest.dat
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/carol/etc/ipsec.conf b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/carol/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/carol/etc/ipsec.d/cacerts/strongswanCert.pem b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/ipsec.d/cacerts/strongswanCert.pem
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/carol/etc/ipsec.d/cacerts/strongswanCert.pem
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/ipsec.d/cacerts/strongswanCert.pem
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/carol/etc/ipsec.d/certs/carolCert.pem b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/ipsec.d/certs/carolCert.pem
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/carol/etc/ipsec.d/certs/carolCert.pem
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/ipsec.d/certs/carolCert.pem
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/carol/etc/ipsec.d/private/carolKey.pem b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/ipsec.d/private/carolKey.pem
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/carol/etc/ipsec.d/private/carolKey.pem
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/ipsec.d/private/carolKey.pem
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/carol/etc/ipsec.secrets b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/carol/etc/ipsec.secrets
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/ipsec.secrets
diff --git a/testing/tests/openssl/ikev2-alg-ecp-high/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-high/hosts/moon/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/dave/etc/ipsec.conf b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/dave/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/dave/etc/ipsec.d/cacerts/strongswanCert.pem b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/ipsec.d/cacerts/strongswanCert.pem
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/dave/etc/ipsec.d/cacerts/strongswanCert.pem
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/ipsec.d/cacerts/strongswanCert.pem
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/dave/etc/ipsec.d/certs/daveCert.pem b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/ipsec.d/certs/daveCert.pem
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/dave/etc/ipsec.d/certs/daveCert.pem
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/ipsec.d/certs/daveCert.pem
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/dave/etc/ipsec.d/private/daveKey.pem b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/ipsec.d/private/daveKey.pem
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/dave/etc/ipsec.d/private/daveKey.pem
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/ipsec.d/private/daveKey.pem
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/dave/etc/ipsec.secrets b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/dave/etc/ipsec.secrets
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/ipsec.secrets
diff --git a/testing/tests/openssl/ikev2-alg-ecp-low/hosts/carol/etc/strongswan.conf b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-low/hosts/carol/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/moon/etc/ipsec.conf b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/moon/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/moon/etc/ipsec.d/cacerts/strongswanCert.pem b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/ipsec.d/cacerts/strongswanCert.pem
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/moon/etc/ipsec.d/cacerts/strongswanCert.pem
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/ipsec.d/cacerts/strongswanCert.pem
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/moon/etc/ipsec.d/certs/moonCert.pem b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/ipsec.d/certs/moonCert.pem
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/moon/etc/ipsec.d/certs/moonCert.pem
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/ipsec.d/certs/moonCert.pem
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/moon/etc/ipsec.d/private/moonKey.pem b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/ipsec.d/private/moonKey.pem
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/moon/etc/ipsec.d/private/moonKey.pem
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/ipsec.d/private/moonKey.pem
diff --git a/testing/tests/openssl/ecdsa-certs/hosts/moon/etc/ipsec.secrets b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/openssl/ecdsa-certs/hosts/moon/etc/ipsec.secrets
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/ipsec.secrets
diff --git a/testing/tests/openssl/ikev2-alg-ecp-low/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/ikev2-alg-ecp-low/hosts/moon/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl/rw-cert-ikev1/posttest.dat b/testing/tests/openssl-ikev2/ecdsa-certs/posttest.dat
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev1/posttest.dat
rename to testing/tests/openssl-ikev2/ecdsa-certs/posttest.dat
diff --git a/testing/tests/openssl/rw-cert-ikev1/pretest.dat b/testing/tests/openssl-ikev2/ecdsa-certs/pretest.dat
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev1/pretest.dat
rename to testing/tests/openssl-ikev2/ecdsa-certs/pretest.dat
diff --git a/testing/tests/openssl/rw-cert-ikev1/test.conf b/testing/tests/openssl-ikev2/ecdsa-certs/test.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev1/test.conf
rename to testing/tests/openssl-ikev2/ecdsa-certs/test.conf
diff --git a/testing/tests/openssl/rw-cert-ikev2/description.txt b/testing/tests/openssl-ikev2/rw-cert/description.txt
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev2/description.txt
rename to testing/tests/openssl-ikev2/rw-cert/description.txt
diff --git a/testing/tests/openssl/rw-cert-ikev2/evaltest.dat b/testing/tests/openssl-ikev2/rw-cert/evaltest.dat
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev2/evaltest.dat
rename to testing/tests/openssl-ikev2/rw-cert/evaltest.dat
diff --git a/testing/tests/openssl/rw-cert-ikev2/hosts/carol/etc/ipsec.conf b/testing/tests/openssl-ikev2/rw-cert/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev2/hosts/carol/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/rw-cert/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/openssl/rw-cert-ikev2/hosts/carol/etc/strongswan.conf b/testing/tests/openssl-ikev2/rw-cert/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev2/hosts/carol/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/rw-cert/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl/rw-cert-ikev2/hosts/dave/etc/ipsec.conf b/testing/tests/openssl-ikev2/rw-cert/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev2/hosts/dave/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/rw-cert/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/openssl/rw-cert-ikev2/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev2/rw-cert/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev2/hosts/dave/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/rw-cert/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl/rw-cert-ikev2/hosts/moon/etc/ipsec.conf b/testing/tests/openssl-ikev2/rw-cert/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev2/hosts/moon/etc/ipsec.conf
rename to testing/tests/openssl-ikev2/rw-cert/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/openssl/rw-cert-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev2/rw-cert/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev2/hosts/moon/etc/strongswan.conf
rename to testing/tests/openssl-ikev2/rw-cert/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl/rw-cert-ikev2/posttest.dat b/testing/tests/openssl-ikev2/rw-cert/posttest.dat
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev2/posttest.dat
rename to testing/tests/openssl-ikev2/rw-cert/posttest.dat
diff --git a/testing/tests/openssl/rw-cert-ikev2/pretest.dat b/testing/tests/openssl-ikev2/rw-cert/pretest.dat
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev2/pretest.dat
rename to testing/tests/openssl-ikev2/rw-cert/pretest.dat
diff --git a/testing/tests/openssl/rw-cert-ikev2/test.conf b/testing/tests/openssl-ikev2/rw-cert/test.conf
similarity index 100%
rename from testing/tests/openssl/rw-cert-ikev2/test.conf
rename to testing/tests/openssl-ikev2/rw-cert/test.conf