diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp
index b6bac7a0a74..251f6f3fbc9 100644
--- a/ext/intl/dateformat/dateformat_create.cpp
+++ b/ext/intl/dateformat/dateformat_create.cpp
@@ -115,8 +115,8 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
 	locale = Locale::createFromName(final_locale);
 	/* get*Name accessors being set does not preclude being bogus */
 	if (locale.isBogus() || ((locale_len == 1 && locale_str[0] != 'C') || (locale_len > 1 && strlen(locale.getISO3Language()) == 0))) {
-        zend_argument_value_error(1, "\"%s\" is invalid", locale_str);
-		return FAILURE;
+		zend_argument_value_error(1, "\"%s\" is invalid", locale_str);
+		goto error;
 	}
 
 	/* process calendar */
diff --git a/ext/intl/tests/gh11942_datefmt_locale_canonicalization.phpt b/ext/intl/tests/gh11942_datefmt_locale_canonicalization.phpt
index aec539ff14d..26b0234fd3b 100644
--- a/ext/intl/tests/gh11942_datefmt_locale_canonicalization.phpt
+++ b/ext/intl/tests/gh11942_datefmt_locale_canonicalization.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Fix GH-11942: IntlDateFormatter should canonicalize locale strings
+GH-11942 (IntlDateFormatter should canonicalize locale strings)
 --EXTENSIONS--
 intl
 --FILE--
diff --git a/ext/intl/tests/gh11942_numfmt_locale_canonicalization.phpt b/ext/intl/tests/gh11942_numfmt_locale_canonicalization.phpt
index 9a17c336729..bdb753d6127 100644
--- a/ext/intl/tests/gh11942_numfmt_locale_canonicalization.phpt
+++ b/ext/intl/tests/gh11942_numfmt_locale_canonicalization.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Fix GH-11942: NumberFormatter should canonicalize locale strings
+GH-11942 (NumberFormatter should canonicalize locale strings)
 --EXTENSIONS--
 intl
 --FILE--