diff --git a/ext/filter/tests/PMOPB45.phpt b/ext/filter/tests/CVE-2007-1900.phpt
similarity index 72%
rename from ext/filter/tests/PMOPB45.phpt
rename to ext/filter/tests/CVE-2007-1900.phpt
index 9aba547539718..d18fd4e5026f5 100644
--- a/ext/filter/tests/PMOPB45.phpt
+++ b/ext/filter/tests/CVE-2007-1900.phpt
@@ -1,5 +1,5 @@
 --TEST--
-PMOPB-45-2007:PHP ext/filter Email Validation Vulnerability
+CVE-2007-1900: PHP ext/filter Email Validation Vulnerability
 --EXTENSIONS--
 filter
 --FILE--
diff --git a/ext/filter/tests/bug42718-2.phpt b/ext/filter/tests/bug42718-2.phpt
index 675ce1a747d89..ad8383d85db2e 100644
--- a/ext/filter/tests/bug42718-2.phpt
+++ b/ext/filter/tests/bug42718-2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #42718 - 2 (unsafe_raw filter not applied when configured as default filter)
+Bug #42718 (unsafe_raw filter not applied when configured as default filter)
 --EXTENSIONS--
 filter
 --INI--
diff --git a/ext/filter/tests/bug49274.phpt b/ext/filter/tests/bug49274.phpt
index 12980db404177..3a2b434b0bc7d 100644
--- a/ext/filter/tests/bug49274.phpt
+++ b/ext/filter/tests/bug49274.phpt
@@ -1,5 +1,5 @@
 --TEST--
-#49274, fatal error when an object does not implement toString
+Bug #49274 (fatal error when an object does not implement toString)
 --EXTENSIONS--
 filter
 --FILE--
diff --git a/ext/filter/tests/bug49510.phpt b/ext/filter/tests/bug49510.phpt
index 2a45915561161..b34afffcc03b9 100644
--- a/ext/filter/tests/bug49510.phpt
+++ b/ext/filter/tests/bug49510.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #49510	boolean validation fails with FILTER_NULL_ON_FAILURE
+Bug #49510 (boolean validation fails with FILTER_NULL_ON_FAILURE)
 --EXTENSIONS--
 filter
 --FILE--
diff --git a/ext/filter/tests/bug50632.phpt b/ext/filter/tests/bug50632.phpt
index 5fa35c4d0bb69..07eae7aa54d35 100644
--- a/ext/filter/tests/bug50632.phpt
+++ b/ext/filter/tests/bug50632.phpt
@@ -1,5 +1,5 @@
 --TEST--
-bug 50632, filter_input() does not return default value if the variable does not exist
+Bug #50632 (filter_input() does not return default value if the variable does not exist)
 --EXTENSIONS--
 filter
 --FILE--
diff --git a/ext/filter/tests/bug51192.phpt b/ext/filter/tests/bug51192.phpt
index 397f22d1d8817..fd4fd09c4422a 100644
--- a/ext/filter/tests/bug51192.phpt
+++ b/ext/filter/tests/bug51192.phpt
@@ -1,5 +1,5 @@
 --TEST--
-bug 51192, FILTER_VALIDATE_URL will invalidate a hostname that includes '-'
+Bug #51192 (FILTER_VALIDATE_URL will invalidate a hostname that includes '-')
 --EXTENSIONS--
 filter
 --FILE--
diff --git a/ext/filter/tests/bug51368.phpt b/ext/filter/tests/bug51368.phpt
index 73c743b5dee4f..a7bc26d478122 100644
--- a/ext/filter/tests/bug51368.phpt
+++ b/ext/filter/tests/bug51368.phpt
@@ -1,5 +1,5 @@
 --TEST--
-FR #51368 (php_filter_float does not allow custom thousand separators)
+Bug #51368 (php_filter_float does not allow custom thousand separators)
 --EXTENSIONS--
 filter
 --FILE--
diff --git a/ext/filter/tests/bug64441.phpt b/ext/filter/tests/bug64441.phpt
index 189f79d00c4ef..2dcc2a0f4fbcc 100644
--- a/ext/filter/tests/bug64441.phpt
+++ b/ext/filter/tests/bug64441.phpt
@@ -1,5 +1,5 @@
 --TEST--
-bug 64441, FILTER_VALIDATE_URL will invalidate a hostname that ended by dot
+Bug #64441 (FILTER_VALIDATE_URL will invalidate a hostname that ended by dot)
 --EXTENSIONS--
 filter
 --FILE--
diff --git a/ext/filter/tests/bug67167.01.phpt b/ext/filter/tests/bug67167.01.phpt
index f51ccbe0dfc95..a55fabda304f1 100644
--- a/ext/filter/tests/bug67167.01.phpt
+++ b/ext/filter/tests/bug67167.01.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #67167: object with VALIDATE_BOOLEAN and NULL_ON_FAILURE
+Bug #67167 (object with VALIDATE_BOOLEAN and NULL_ON_FAILURE)
 --EXTENSIONS--
 filter
 --FILE--
diff --git a/ext/filter/tests/bug67167.02.phpt b/ext/filter/tests/bug67167.02.phpt
index 62927309e62a4..acbb7eeca5fe7 100644
--- a/ext/filter/tests/bug67167.02.phpt
+++ b/ext/filter/tests/bug67167.02.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #67167: filter_var(null,FILTER_VALIDATE_BOOLEAN,FILTER_NULL_ON_FAILURE) returns null
+Bug #67167 (filter_var(null,FILTER_VALIDATE_BOOLEAN,FILTER_NULL_ON_FAILURE) returns null)
 --EXTENSIONS--
 filter
 --FILE--
diff --git a/ext/filter/tests/bug7715.phpt b/ext/filter/tests/bug7715.phpt
index 7c31b30d91c4b..9855a723fe987 100644
--- a/ext/filter/tests/bug7715.phpt
+++ b/ext/filter/tests/bug7715.phpt
@@ -1,5 +1,5 @@
 --TEST--
-bug 7715, floats value with integer or incomplete input
+Bug #7715 (floats value with integer or incomplete input)
 --INI--
 precision=14
 --EXTENSIONS--
diff --git a/ext/filter/tests/bug7733.phpt b/ext/filter/tests/bug7733.phpt
index a276d8a2b4a31..7a24decea2c54 100644
--- a/ext/filter/tests/bug7733.phpt
+++ b/ext/filter/tests/bug7733.phpt
@@ -1,5 +1,5 @@
 --TEST--
-filter_var() Float exponential weird result
+Bug #7733 (filter_var() Float exponential weird result)
 --EXTENSIONS--
 filter
 --FILE--
diff --git a/ext/filter/tests/bug80584.phpt b/ext/filter/tests/bug80584.phpt
index 49fa71a921f05..9446c649f4bad 100644
--- a/ext/filter/tests/bug80584.phpt
+++ b/ext/filter/tests/bug80584.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #80584: "0x" and "0X" are considered valid hex numbers by filter_var()
+Bug #80584 ("0x" and "0X" are considered valid hex numbers by filter_var())
 --EXTENSIONS--
 filter
 --FILE--
diff --git a/ext/filter/tests/bug8315.phpt b/ext/filter/tests/bug8315.phpt
index e5334f43fc87f..55e1a745fa041 100644
--- a/ext/filter/tests/bug8315.phpt
+++ b/ext/filter/tests/bug8315.phpt
@@ -1,5 +1,5 @@
 --TEST--
-bug 8315, NULL values halt the validation
+Bug #8315 (NULL values halt the validation)
 --EXTENSIONS--
 filter
 --FILE--