diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile.phpt
index 2cfbf35fbd4..4e1c701f0ef 100644
--- a/ext/dom/tests/DOMDocument_loadHTMLfile.phpt
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile.phpt
@@ -4,8 +4,6 @@ Test DOMDocument::loadHTMLFile
Verifies the basic behaviour of the method
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--FILE--
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt
index 5b88546908d..08bf361216f 100644
--- a/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt
@@ -4,8 +4,6 @@ Test DOMDocument::loadHTMLFile when the file doesn't exist
Verifies that an error message is showed if the file doesn't exist
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--FILE--
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt
index 116fd540c50..a5ef58a6565 100644
--- a/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt
@@ -4,8 +4,6 @@ Test DOMDocument::loadHTMLFile when an empty string is passed
Verifies that an error message is showed if an empty string is passed as argument
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--FILE--
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt
index 3519a9fa215..b3ff73d1f34 100644
--- a/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt
@@ -4,8 +4,6 @@ Test DOMDocument::loadHTMLFile when an empty document is loaded
Verifies that an warning message is showed if an empty document is loaded
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--FILE--
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt
index 0f5a17b7c47..e5de1cb57ba 100644
--- a/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt
@@ -4,8 +4,6 @@ Test DOMDocument::loadHTMLFile when a not-well formed document is loaded
Verifies the behavior if a not-well formed document is loaded
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--FILE--
diff --git a/ext/dom/tests/DOMDocument_loadXML_basic.phpt b/ext/dom/tests/DOMDocument_loadXML_basic.phpt
index 99b1d9c0c49..6e8451f6892 100644
--- a/ext/dom/tests/DOMDocument_loadXML_basic.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_basic.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_loadXML_error1.phpt b/ext/dom/tests/DOMDocument_loadXML_error1.phpt
index 14d99e4ed9a..30764aac3e0 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error1.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error1.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_loadXML_error2_gte2_11.phpt b/ext/dom/tests/DOMDocument_loadXML_error2_gte2_11.phpt
index ff5ceb3fbed..b871dab656b 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error2_gte2_11.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error2_gte2_11.phpt
@@ -12,8 +12,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_loadXML_error2_pre2_11.phpt b/ext/dom/tests/DOMDocument_loadXML_error2_pre2_11.phpt
index c826386f7a4..15e1d1bba2c 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error2_pre2_11.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error2_pre2_11.phpt
@@ -12,8 +12,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_loadXML_error3.phpt b/ext/dom/tests/DOMDocument_loadXML_error3.phpt
index 2050dee66e3..ab9cc608d2d 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error3.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error3.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_loadXML_error4.phpt b/ext/dom/tests/DOMDocument_loadXML_error4.phpt
index 2eea878aa09..3d87ff42100 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error4.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error4.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_loadXML_error5.phpt b/ext/dom/tests/DOMDocument_loadXML_error5.phpt
index c5bd0c6e89f..8ae7f5d8910 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error5.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error5.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_loadXML_variation1.phpt b/ext/dom/tests/DOMDocument_loadXML_variation1.phpt
index 7f55d9cab90..4ad1d7e5d5e 100644
--- a/ext/dom/tests/DOMDocument_loadXML_variation1.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_variation1.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_loadXML_variation2.phpt b/ext/dom/tests/DOMDocument_loadXML_variation2.phpt
index 75a0bce06c2..4077cd9ebe4 100644
--- a/ext/dom/tests/DOMDocument_loadXML_variation2.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_variation2.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_loadXML_variation3.phpt b/ext/dom/tests/DOMDocument_loadXML_variation3.phpt
index 7a4aefd4206..6e607db360c 100644
--- a/ext/dom/tests/DOMDocument_loadXML_variation3.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_variation3.phpt
@@ -9,8 +9,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_loadXML_variation4.phpt b/ext/dom/tests/DOMDocument_loadXML_variation4.phpt
index 0bd80c41e2c..49c6dfb71cf 100644
--- a/ext/dom/tests/DOMDocument_loadXML_variation4.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_variation4.phpt
@@ -9,8 +9,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_load_basic.phpt b/ext/dom/tests/DOMDocument_load_basic.phpt
index b3f33df7f67..820d82a1c1c 100644
--- a/ext/dom/tests/DOMDocument_load_basic.phpt
+++ b/ext/dom/tests/DOMDocument_load_basic.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_load_error1.phpt b/ext/dom/tests/DOMDocument_load_error1.phpt
index f736b0a0e81..e2521e9f8ee 100644
--- a/ext/dom/tests/DOMDocument_load_error1.phpt
+++ b/ext/dom/tests/DOMDocument_load_error1.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_load_error2_gte2_11.phpt b/ext/dom/tests/DOMDocument_load_error2_gte2_11.phpt
index 32b6bf16114..cbf0ed57f56 100644
--- a/ext/dom/tests/DOMDocument_load_error2_gte2_11.phpt
+++ b/ext/dom/tests/DOMDocument_load_error2_gte2_11.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test DOMDocument::load() detects not-well formed
+Test DOMDocument::load() detects not-well formed
--SKIPIF--
= 2.11');
@@ -12,8 +12,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_load_error2_pre2_11.phpt b/ext/dom/tests/DOMDocument_load_error2_pre2_11.phpt
index 695740be9ca..e3c81af5011 100644
--- a/ext/dom/tests/DOMDocument_load_error2_pre2_11.phpt
+++ b/ext/dom/tests/DOMDocument_load_error2_pre2_11.phpt
@@ -12,8 +12,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_load_error3.phpt b/ext/dom/tests/DOMDocument_load_error3.phpt
index 3fcb67ad66d..6158d0fad7a 100644
--- a/ext/dom/tests/DOMDocument_load_error3.phpt
+++ b/ext/dom/tests/DOMDocument_load_error3.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_load_error4.phpt b/ext/dom/tests/DOMDocument_load_error4.phpt
index 74e879f44b0..306f8428ee0 100644
--- a/ext/dom/tests/DOMDocument_load_error4.phpt
+++ b/ext/dom/tests/DOMDocument_load_error4.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_load_error5.phpt b/ext/dom/tests/DOMDocument_load_error5.phpt
index 06a4701526c..82ae2ecc763 100644
--- a/ext/dom/tests/DOMDocument_load_error5.phpt
+++ b/ext/dom/tests/DOMDocument_load_error5.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_load_variation1.phpt b/ext/dom/tests/DOMDocument_load_variation1.phpt
index a9f502d617b..b6268c9c9f2 100644
--- a/ext/dom/tests/DOMDocument_load_variation1.phpt
+++ b/ext/dom/tests/DOMDocument_load_variation1.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_load_variation2.phpt b/ext/dom/tests/DOMDocument_load_variation2.phpt
index 98ea255f053..96ec6084b35 100644
--- a/ext/dom/tests/DOMDocument_load_variation2.phpt
+++ b/ext/dom/tests/DOMDocument_load_variation2.phpt
@@ -8,8 +8,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_load_variation3.phpt b/ext/dom/tests/DOMDocument_load_variation3.phpt
index d9e27085da6..420a4fa91b6 100644
--- a/ext/dom/tests/DOMDocument_load_variation3.phpt
+++ b/ext/dom/tests/DOMDocument_load_variation3.phpt
@@ -9,8 +9,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMDocument_load_variation4.phpt b/ext/dom/tests/DOMDocument_load_variation4.phpt
index 75c887f7156..72cd72329df 100644
--- a/ext/dom/tests/DOMDocument_load_variation4.phpt
+++ b/ext/dom/tests/DOMDocument_load_variation4.phpt
@@ -9,8 +9,6 @@ Environment variables used in the test:
- EXPECTED_RESULT: the expected result
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--ENV--
diff --git a/ext/dom/tests/DOMNode_insertBefore_error2.phpt b/ext/dom/tests/DOMNode_insertBefore_error2.phpt
index 033c800759e..317eb897919 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error2.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error2.phpt
@@ -6,8 +6,6 @@ DOM_NOT_FOUND is raised if refnode is not a child
This test checks the error message is raised when the refnode is a sibling
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--FILE--
diff --git a/ext/dom/tests/DOMNode_insertBefore_error3.phpt b/ext/dom/tests/DOMNode_insertBefore_error3.phpt
index 638f12663d3..9fa25e3b2ac 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error3.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error3.phpt
@@ -6,8 +6,6 @@ DOM_NOT_FOUND is raised if refnode is not a child
This test checks the error message is raised when refnode is the parent node
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--FILE--
diff --git a/ext/dom/tests/DOMNode_insertBefore_error4.phpt b/ext/dom/tests/DOMNode_insertBefore_error4.phpt
index aac3ee1e53f..41838bb78a1 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error4.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error4.phpt
@@ -6,8 +6,6 @@ DOM_NOT_FOUND is raised if refnode is not a child
This test checks the error message is raised when the refnode is a brand new node
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--FILE--
diff --git a/ext/dom/tests/DOMNode_insertBefore_error5.phpt b/ext/dom/tests/DOMNode_insertBefore_error5.phpt
index 1ec79c6ed63..17ac5382066 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error5.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error5.phpt
@@ -6,8 +6,6 @@ DOM_NOT_FOUND is raised if refnode is not a child
This test checks the error message is raised when the refnode is a descendant but not a child
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--FILE--
diff --git a/ext/dom/tests/DOMNode_insertBefore_error6.phpt b/ext/dom/tests/DOMNode_insertBefore_error6.phpt
index cd619f8d8ab..a8348791f17 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error6.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error6.phpt
@@ -6,8 +6,6 @@ DOM_NOT_FOUND is raised if refnode is not a child
This test checks the error message is raised when the refnode is the parent
--CREDITS--
Antonio Diaz Ruiz
---INI--
-assert.bail=true
--EXTENSIONS--
dom
--FILE--