diff --git a/testing/tests/ikev2/alg-aes-xcbc/description.txt b/testing/tests/ikev2/alg-aes-xcbc/description.txt
new file mode 100644
index 0000000000..24a4afe57c
--- /dev/null
+++ b/testing/tests/ikev2/alg-aes-xcbc/description.txt
@@ -0,0 +1,4 @@
+Roadwarrior <b>carol</b> proposes  to gateway <b>moon</b> the ESP cipher suite
+<b>AES_CBC-256/AES_XCBC_96</b> by defining <b>esp=aes256-aesxcbc-modp2048</b>
+in ipsec.conf. The same cipher suite is used for IKE: <b>ike=aes256-aesxcbc-modp2048</b>.
+A ping from <b>carol</b> to <b>alice</b> successfully checks the established tunnel.
diff --git a/testing/tests/ikev2/esp-alg-aesxcbc/evaltest.dat b/testing/tests/ikev2/alg-aes-xcbc/evaltest.dat
similarity index 100%
rename from testing/tests/ikev2/esp-alg-aesxcbc/evaltest.dat
rename to testing/tests/ikev2/alg-aes-xcbc/evaltest.dat
diff --git a/testing/tests/ikev2/esp-alg-aesxcbc/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/alg-aes-xcbc/hosts/carol/etc/ipsec.conf
similarity index 93%
rename from testing/tests/ikev2/esp-alg-aesxcbc/hosts/carol/etc/ipsec.conf
rename to testing/tests/ikev2/alg-aes-xcbc/hosts/carol/etc/ipsec.conf
index 25f8ce8b20..edd0aaaf83 100755
--- a/testing/tests/ikev2/esp-alg-aesxcbc/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev2/alg-aes-xcbc/hosts/carol/etc/ipsec.conf
@@ -11,7 +11,7 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev2
-	ike=aes256-sha256-modp2048!
+	ike=aes256-aesxcbc-modp2048!
 	esp=aes256-aesxcbc-modp2048!
 
 conn home
diff --git a/testing/tests/ikev2/esp-alg-aesxcbc/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/alg-aes-xcbc/hosts/moon/etc/ipsec.conf
similarity index 93%
rename from testing/tests/ikev2/esp-alg-aesxcbc/hosts/moon/etc/ipsec.conf
rename to testing/tests/ikev2/alg-aes-xcbc/hosts/moon/etc/ipsec.conf
index 303a49152a..18618929fe 100755
--- a/testing/tests/ikev2/esp-alg-aesxcbc/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev2/alg-aes-xcbc/hosts/moon/etc/ipsec.conf
@@ -11,7 +11,7 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev2
-	ike=aes256-sha256-modp2048!
+	ike=aes256-aesxcbc-modp2048!
 	esp=aes256-aesxcbc-modp2048!
 
 conn rw
diff --git a/testing/tests/ikev2/esp-alg-aesxcbc/posttest.dat b/testing/tests/ikev2/alg-aes-xcbc/posttest.dat
similarity index 100%
rename from testing/tests/ikev2/esp-alg-aesxcbc/posttest.dat
rename to testing/tests/ikev2/alg-aes-xcbc/posttest.dat
diff --git a/testing/tests/ikev2/esp-alg-aesxcbc/pretest.dat b/testing/tests/ikev2/alg-aes-xcbc/pretest.dat
similarity index 100%
rename from testing/tests/ikev2/esp-alg-aesxcbc/pretest.dat
rename to testing/tests/ikev2/alg-aes-xcbc/pretest.dat
diff --git a/testing/tests/ikev2/esp-alg-aesxcbc/test.conf b/testing/tests/ikev2/alg-aes-xcbc/test.conf
similarity index 100%
rename from testing/tests/ikev2/esp-alg-aesxcbc/test.conf
rename to testing/tests/ikev2/alg-aes-xcbc/test.conf
diff --git a/testing/tests/ikev2/esp-alg-aesxcbc/description.txt b/testing/tests/ikev2/esp-alg-aesxcbc/description.txt
deleted file mode 100644
index 0ea28a716e..0000000000
--- a/testing/tests/ikev2/esp-alg-aesxcbc/description.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Roadwarrior <b>carol</b> proposes  to gateway <b>moon</b> the ESP cipher suite
-<b>AES_CBC-256/AES_XCBC_96</b> by defining <b>esp=aes256-aesxcbc-modp2048</b>
-in ipsec.conf. A ping from <b>carol</b> to <b>alice</b> successfully checks
-the established tunnel.