diff --git a/testing/rw-eap-dynamic/description.txt b/testing/tests/ikev2/rw-eap-dynamic/description.txt
similarity index 100%
rename from testing/rw-eap-dynamic/description.txt
rename to testing/tests/ikev2/rw-eap-dynamic/description.txt
diff --git a/testing/rw-eap-dynamic/evaltest.dat b/testing/tests/ikev2/rw-eap-dynamic/evaltest.dat
similarity index 100%
rename from testing/rw-eap-dynamic/evaltest.dat
rename to testing/tests/ikev2/rw-eap-dynamic/evaltest.dat
diff --git a/testing/rw-eap-dynamic/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-dynamic/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/rw-eap-dynamic/hosts/carol/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-dynamic/hosts/carol/etc/ipsec.conf
diff --git a/testing/rw-eap-dynamic/hosts/carol/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-dynamic/hosts/carol/etc/ipsec.secrets
similarity index 100%
rename from testing/rw-eap-dynamic/hosts/carol/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-dynamic/hosts/carol/etc/ipsec.secrets
diff --git a/testing/rw-eap-dynamic/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-dynamic/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/rw-eap-dynamic/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-dynamic/hosts/carol/etc/strongswan.conf
diff --git a/testing/rw-eap-dynamic/hosts/dave/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-dynamic/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/rw-eap-dynamic/hosts/dave/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-dynamic/hosts/dave/etc/ipsec.conf
diff --git a/testing/rw-eap-dynamic/hosts/dave/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-dynamic/hosts/dave/etc/ipsec.secrets
similarity index 100%
rename from testing/rw-eap-dynamic/hosts/dave/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-dynamic/hosts/dave/etc/ipsec.secrets
diff --git a/testing/rw-eap-dynamic/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-dynamic/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/rw-eap-dynamic/hosts/dave/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-dynamic/hosts/dave/etc/strongswan.conf
diff --git a/testing/rw-eap-dynamic/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-dynamic/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/rw-eap-dynamic/hosts/moon/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-dynamic/hosts/moon/etc/ipsec.conf
diff --git a/testing/rw-eap-dynamic/hosts/moon/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-dynamic/hosts/moon/etc/ipsec.secrets
similarity index 100%
rename from testing/rw-eap-dynamic/hosts/moon/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-dynamic/hosts/moon/etc/ipsec.secrets
diff --git a/testing/rw-eap-dynamic/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-dynamic/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/rw-eap-dynamic/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-dynamic/hosts/moon/etc/strongswan.conf
diff --git a/testing/rw-eap-dynamic/posttest.dat b/testing/tests/ikev2/rw-eap-dynamic/posttest.dat
similarity index 100%
rename from testing/rw-eap-dynamic/posttest.dat
rename to testing/tests/ikev2/rw-eap-dynamic/posttest.dat
diff --git a/testing/rw-eap-dynamic/pretest.dat b/testing/tests/ikev2/rw-eap-dynamic/pretest.dat
similarity index 100%
rename from testing/rw-eap-dynamic/pretest.dat
rename to testing/tests/ikev2/rw-eap-dynamic/pretest.dat
diff --git a/testing/rw-eap-dynamic/test.conf b/testing/tests/ikev2/rw-eap-dynamic/test.conf
similarity index 100%
rename from testing/rw-eap-dynamic/test.conf
rename to testing/tests/ikev2/rw-eap-dynamic/test.conf