diff --git a/testing/tests/ikev1/xauth-psk-mode-config/description.txt b/testing/tests/ikev1/xauth-id-psk-mode-config/description.txt
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/description.txt
rename to testing/tests/ikev1/xauth-id-psk-mode-config/description.txt
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/evaltest.dat b/testing/tests/ikev1/xauth-id-psk-mode-config/evaltest.dat
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/evaltest.dat
rename to testing/tests/ikev1/xauth-id-psk-mode-config/evaltest.dat
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/hosts/carol/etc/ipsec.conf b/testing/tests/ikev1/xauth-id-psk-mode-config/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/hosts/carol/etc/ipsec.conf
rename to testing/tests/ikev1/xauth-id-psk-mode-config/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/hosts/carol/etc/ipsec.secrets b/testing/tests/ikev1/xauth-id-psk-mode-config/hosts/carol/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/hosts/carol/etc/ipsec.secrets
rename to testing/tests/ikev1/xauth-id-psk-mode-config/hosts/carol/etc/ipsec.secrets
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/hosts/carol/etc/strongswan.conf b/testing/tests/ikev1/xauth-id-psk-mode-config/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev1/xauth-id-psk-mode-config/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/hosts/dave/etc/ipsec.conf b/testing/tests/ikev1/xauth-id-psk-mode-config/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/hosts/dave/etc/ipsec.conf
rename to testing/tests/ikev1/xauth-id-psk-mode-config/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/hosts/dave/etc/ipsec.secrets b/testing/tests/ikev1/xauth-id-psk-mode-config/hosts/dave/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/hosts/dave/etc/ipsec.secrets
rename to testing/tests/ikev1/xauth-id-psk-mode-config/hosts/dave/etc/ipsec.secrets
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/hosts/dave/etc/strongswan.conf b/testing/tests/ikev1/xauth-id-psk-mode-config/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/hosts/dave/etc/strongswan.conf
rename to testing/tests/ikev1/xauth-id-psk-mode-config/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/xauth-id-psk-mode-config/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/hosts/moon/etc/ipsec.conf
rename to testing/tests/ikev1/xauth-id-psk-mode-config/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/hosts/moon/etc/ipsec.secrets b/testing/tests/ikev1/xauth-id-psk-mode-config/hosts/moon/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/hosts/moon/etc/ipsec.secrets
rename to testing/tests/ikev1/xauth-id-psk-mode-config/hosts/moon/etc/ipsec.secrets
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/hosts/moon/etc/strongswan.conf b/testing/tests/ikev1/xauth-id-psk-mode-config/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev1/xauth-id-psk-mode-config/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/posttest.dat b/testing/tests/ikev1/xauth-id-psk-mode-config/posttest.dat
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/posttest.dat
rename to testing/tests/ikev1/xauth-id-psk-mode-config/posttest.dat
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/pretest.dat b/testing/tests/ikev1/xauth-id-psk-mode-config/pretest.dat
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/pretest.dat
rename to testing/tests/ikev1/xauth-id-psk-mode-config/pretest.dat
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/test.conf b/testing/tests/ikev1/xauth-id-psk-mode-config/test.conf
similarity index 100%
rename from testing/tests/ikev1/xauth-psk-mode-config/test.conf
rename to testing/tests/ikev1/xauth-id-psk-mode-config/test.conf