diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
index 21b90a91..e2678872 100644
--- a/src/View/Helper/FormHelper.php
+++ b/src/View/Helper/FormHelper.php
@@ -135,7 +135,7 @@ class FormHelper extends CoreFormHelper
      */
     protected array $_templates = [
         'error' =>
-            '<div id="{{id}}" class="ms-0 invalid-feedback">{{content}}</div>',
+            '<div id="{{id}}" class="invalid-feedback">{{content}}</div>',
         'errorTooltip' =>
             '<div id="{{id}}" class="invalid-tooltip">{{content}}</div>',
         'label' =>
diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/CheckboxControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/CheckboxControlTest.php
index aa40e364..e6c75388 100644
--- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/CheckboxControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/CheckboxControlTest.php
@@ -305,7 +305,7 @@ public function testDefaultAlignCheckboxControlWithError()
                 ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -344,7 +344,7 @@ public function testDefaultAlignCheckboxControlWithErrorAndHelp()
                 ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -391,7 +391,7 @@ public function testDefaultAlignCheckboxControlWithErrorAndHelpAndOptions()
                 ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -480,7 +480,7 @@ public function testDefaultAlignCheckboxControlContainerOptionsWithError()
                 ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -587,7 +587,7 @@ public function testDefaultAlignCheckboxControlNestedInputWithError()
                     ]],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -871,7 +871,7 @@ public function testDefaultAlignCheckboxControlInlineWithError()
                 ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -955,7 +955,7 @@ public function testDefaultAlignCheckboxControlInlineContainerOptionsWithError()
                 ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/ColorControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/ColorControlTest.php
index daeee542..3cee9d85 100644
--- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/ColorControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/ColorControlTest.php
@@ -263,7 +263,7 @@ public function testDefaultAlignColorControlWithError()
                     'aria-describedby' => 'color-error',
                     'value' => '#ffffff',
                 ],
-                ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -297,7 +297,7 @@ public function testDefaultAlignColorControlWithErrorAndHelp()
                     'aria-describedby' => 'color-error color-help',
                     'value' => '#ffffff',
                 ],
-                ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'color-help', 'class' => 'form-text']],
@@ -339,7 +339,7 @@ public function testDefaultAlignColorControlWithErrorAndHelpOptions()
                     'aria-describedby' => 'color-error custom-help',
                     'value' => '#ffffff',
                 ],
-                ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -420,7 +420,7 @@ public function testDefaultAlignColorControlContainerOptionsWithError()
                     'aria-describedby' => 'color-error',
                     'value' => '#ffffff',
                 ],
-                ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/DateTimeControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/DateTimeControlTest.php
index a2e3d499..f715c032 100644
--- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/DateTimeControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/DateTimeControlTest.php
@@ -304,7 +304,7 @@ public function testDefaultAlignDateTimeControlWithError()
                     'aria-describedby' => 'created-error',
                     'value' => $now->format('Y-m-d H:i:s'),
                 ],
-                ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -343,7 +343,7 @@ public function testDefaultAlignDateTimeControlWithErrorAndHelp()
                     'aria-describedby' => 'created-error created-help',
                     'value' => $now->format('Y-m-d H:i:s'),
                 ],
-                ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'created-help', 'class' => 'form-text']],
@@ -390,7 +390,7 @@ public function testDefaultAlignDateTimeControlWithErrorAndHelpOptions()
                     'aria-describedby' => 'created-error custom-help',
                     'value' => $now->format('Y-m-d H:i:s'),
                 ],
-                ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -476,7 +476,7 @@ public function testDefaultAlignDateTimeControlContainerOptionsWithError()
                     'aria-describedby' => 'created-error',
                     'value' => $now->format('Y-m-d H:i:s'),
                 ],
-                ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileControlTest.php
index e03fe8e4..5e0a5b07 100644
--- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileControlTest.php
@@ -249,7 +249,7 @@ public function testDefaultAlignFileControlWithError()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'file-error',
                 ]],
-                ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -281,7 +281,7 @@ public function testDefaultAlignFileControlWithErrorAndHelp()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'file-error file-help',
                 ]],
-                ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'file-help', 'class' => 'form-text']],
@@ -321,7 +321,7 @@ public function testDefaultAlignFileControlWithErrorAndHelpOptions()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'file-error custom-help',
                 ]],
-                ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -396,7 +396,7 @@ public function testDefaultAlignFileControlContainerOptionsWithError()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'file-error',
                 ]],
-                ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -491,7 +491,7 @@ public function testDefaultAlignFileControlInputGroupWithError()
                         'append',
                     '/span',
                 '/div',
-                ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/MultipleCheckboxControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/MultipleCheckboxControlTest.php
index ee2cadf2..86a53fca 100644
--- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/MultipleCheckboxControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/MultipleCheckboxControlTest.php
@@ -468,7 +468,7 @@ public function testDefaultAlignMultipleCheckboxControlWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -535,7 +535,7 @@ public function testDefaultAlignMultipleCheckboxControlWithErrorAndHelp()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -610,7 +610,7 @@ public function testDefaultAlignMultipleCheckboxControlWithErrorAndHelpOptions()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -685,7 +685,7 @@ public function testDefaultAlignMultipleCheckboxControlCustomAriaDescribedByWith
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -819,7 +819,7 @@ public function testDefaultAlignMultipleCheckboxControlContainerOptionsWithError
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -938,7 +938,7 @@ public function testDefaultAlignMultipleCheckboxControlNestedInputWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1386,7 +1386,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1519,7 +1519,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineContainerOptionsWit
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1867,7 +1867,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsWithError()
                         '/label',
                     '/div',
                  '/fieldset',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RadioControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RadioControlTest.php
index 9815ebb4..cb957641 100644
--- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RadioControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RadioControlTest.php
@@ -457,7 +457,7 @@ public function testDefaultAlignRadioControlWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -524,7 +524,7 @@ public function testDefaultAlignRadioControlWithErrorAndHelp()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -599,7 +599,7 @@ public function testDefaultAlignRadioControlWithErrorAndHelpOptions()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -739,7 +739,7 @@ public function testDefaultAlignRadioControlContainerOptionsWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1232,7 +1232,7 @@ public function testDefaultAlignRadioControlInlineWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1367,7 +1367,7 @@ public function testDefaultAlignRadioControlInlineContainerOptionsWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1490,7 +1490,7 @@ public function testDefaultAlignRadioControlInlineNestedInputWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeControlTest.php
index f0c2f50e..e18d9efa 100644
--- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeControlTest.php
@@ -299,7 +299,7 @@ public function testDefaultAlignRangeControlWithError()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'height-error',
                 ],
-                ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -337,7 +337,7 @@ public function testDefaultAlignRangeControlWithErrorAndHelp()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'height-error height-help',
                 ],
-                ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'height-help', 'class' => 'form-text']],
@@ -383,7 +383,7 @@ public function testDefaultAlignRangeControlWithErrorAndHelpOptions()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'height-error custom-help',
                 ],
-                ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -470,7 +470,7 @@ public function testDefaultAlignRangeControlContainerOptionsWithError()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'height-error',
                 ],
-                ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/SelectControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/SelectControlTest.php
index 6cdcf4ad..7fa9f85b 100644
--- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/SelectControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/SelectControlTest.php
@@ -343,7 +343,7 @@ public function testDefaultAlignSelectControlWithError()
                         'option 2',
                     '/option',
                 '/select',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -385,7 +385,7 @@ public function testDefaultAlignSelectControlWithErrorAndHelp()
                         'option 2',
                     '/option',
                 '/select',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -435,7 +435,7 @@ public function testDefaultAlignSelectControlWithErrorAndHelpOptions()
                         'option 2',
                     '/option',
                 '/select',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -526,7 +526,7 @@ public function testDefaultAlignSelectControlContainerOptionsWithError()
                         'option 2',
                     '/option',
                 '/select',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/StaticControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/StaticControlTest.php
index 6f868996..87683ffe 100644
--- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/StaticControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/StaticControlTest.php
@@ -323,7 +323,7 @@ public function testDefaultAlignStaticControlWithError()
                     'aria-describedby' => 'title-error',
                     'value' => 'title',
                 ],
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -361,7 +361,7 @@ public function testDefaultAlignStaticControlWithErrorAndHelp()
                     'aria-describedby' => 'title-error title-help',
                     'value' => 'title',
                 ],
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'title-help', 'class' => 'form-text']],
@@ -407,7 +407,7 @@ public function testDefaultAlignStaticControlWithErrorAndHelpOptions()
                     'aria-describedby' => 'title-error custom-help',
                     'value' => 'title',
                 ],
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -494,7 +494,7 @@ public function testDefaultAlignStaticControlContainerOptionsWithError()
                     'aria-describedby' => 'title-error',
                     'value' => 'title',
                 ],
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/TextControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/TextControlTest.php
index 2bbd0c28..e6ff6e3e 100644
--- a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/TextControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/TextControlTest.php
@@ -326,7 +326,7 @@ public function testDefaultAlignTextControlWithError()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'title-error',
                 ],
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -358,7 +358,7 @@ public function testDefaultAlignTextControlWithErrorAndHelp()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'title-error title-help',
                 ],
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'title-help', 'class' => 'form-text']],
@@ -398,7 +398,7 @@ public function testDefaultAlignTextControlWithErrorAndHelpOptions()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'title-error custom-help',
                 ],
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -476,7 +476,7 @@ public function testDefaultAlignTextControlContainerOptionsWithError()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'title-error',
                 ],
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/CheckboxControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/CheckboxControlTest.php
index b196722f..616ce35c 100644
--- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/CheckboxControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/CheckboxControlTest.php
@@ -399,7 +399,7 @@ public function testHorizontalAlignCheckboxControlWithError()
                         ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                             'Users',
                         '/label',
-                        ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                        ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                             'error message',
                         '/div',
                     '/div',
@@ -449,7 +449,7 @@ public function testHorizontalAlignCheckboxControlWithErrorAndHelp()
                         ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                             'Users',
                         '/label',
-                        ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                        ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                             'error message',
                         '/div',
                         ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -507,7 +507,7 @@ public function testHorizontalAlignCheckboxControlWithErrorAndHelpOptions()
                         ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                             'Users',
                         '/label',
-                        ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                        ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                             'error message',
                         '/div',
                         ['div' => [
@@ -618,7 +618,7 @@ public function testHorizontalAlignCheckboxControlContainerOptionsWithError()
                         ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                             'Users',
                         '/label',
-                        ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                        ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                             'error message',
                         '/div',
                     '/div',
@@ -758,7 +758,7 @@ public function testHorizontalAlignCheckboxControlNestedInputWithError()
                             ]],
                             'Users',
                         '/label',
-                        ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                        ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                             'error message',
                         '/div',
                     '/div',
@@ -1126,7 +1126,7 @@ public function testHorizontalAlignCheckboxControlInlineWithError()
                         ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                             'Users',
                         '/label',
-                        ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                        ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                             'error message',
                         '/div',
                     '/div',
@@ -1232,7 +1232,7 @@ public function testHorizontalAlignCheckboxControlInlineContainerOptionsWithErro
                         ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                             'Users',
                         '/label',
-                        ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                        ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                             'error message',
                         '/div',
                     '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/ColorControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/ColorControlTest.php
index 6cb7d29b..2b83816e 100644
--- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/ColorControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/ColorControlTest.php
@@ -354,7 +354,7 @@ public function testHorizontalAlignColorControlWithError()
                         'aria-describedby' => 'color-error',
                         'value' => '#ffffff',
                     ],
-                    ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -398,7 +398,7 @@ public function testHorizontalAlignColorControlWithErrorAndHelp()
                         'aria-describedby' => 'color-error color-help',
                         'value' => '#ffffff',
                     ],
-                    ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => ['id' => 'color-help', 'class' => 'form-text']],
@@ -450,7 +450,7 @@ public function testHorizontalAlignColorControlWithErrorAndHelpOptions()
                         'aria-describedby' => 'color-error custom-help',
                         'value' => '#ffffff',
                     ],
-                    ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => [
@@ -550,7 +550,7 @@ public function testHorizontalAlignColorControlContainerOptionsWithError()
                         'aria-describedby' => 'color-error',
                         'value' => '#ffffff',
                     ],
-                    ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/DateTimeControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/DateTimeControlTest.php
index a0096d8b..29c6cae6 100644
--- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/DateTimeControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/DateTimeControlTest.php
@@ -369,7 +369,7 @@ public function testHorizontalAlignDateTimeControlWithError()
                         'aria-describedby' => 'created-error',
                         'value' => $now->format('Y-m-d H:i:s'),
                     ],
-                    ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -416,7 +416,7 @@ public function testHorizontalAlignDateTimeControlWithErrorAndHelp()
                         'aria-describedby' => 'created-error created-help',
                         'value' => $now->format('Y-m-d H:i:s'),
                     ],
-                    ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => ['id' => 'created-help', 'class' => 'form-text']],
@@ -471,7 +471,7 @@ public function testHorizontalAlignDateTimeControlWithErrorAndHelpOptions()
                         'aria-describedby' => 'created-error custom-help',
                         'value' => $now->format('Y-m-d H:i:s'),
                     ],
-                    ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => [
@@ -573,7 +573,7 @@ public function testHorizontalAlignDateTimeControlContainerOptionsWithError()
                         'aria-describedby' => 'created-error',
                         'value' => $now->format('Y-m-d H:i:s'),
                     ],
-                    ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/FileControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/FileControlTest.php
index 49a2867f..fec73c6b 100644
--- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/FileControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/FileControlTest.php
@@ -330,7 +330,7 @@ public function testHorizontalAlignFileControlWithError()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'file-error',
                     ]],
-                    ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -371,7 +371,7 @@ public function testHorizontalAlignFileControlWithErrorAndHelp()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'file-error file-help',
                     ]],
-                    ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => ['id' => 'file-help', 'class' => 'form-text']],
@@ -420,7 +420,7 @@ public function testHorizontalAlignFileControlWithErrorAndHelpOptions()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'file-error custom-help',
                     ]],
-                    ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => [
@@ -513,7 +513,7 @@ public function testHorizontalAlignFileControlContainerOptionsWithError()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'file-error',
                     ]],
-                    ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -635,7 +635,7 @@ public function testHorizontalAlignFileControlInputGroupWithError()
                             'append',
                         '/span',
                     '/div',
-                    ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/MultipleCheckboxControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/MultipleCheckboxControlTest.php
index 7c32cb80..89207e71 100644
--- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/MultipleCheckboxControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/MultipleCheckboxControlTest.php
@@ -561,7 +561,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithError()
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -637,7 +637,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithErrorAndHelp()
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -721,7 +721,7 @@ public function testHorizontalAlignMultipleCheckboxControlWithErrorAndHelpOption
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => [
@@ -877,7 +877,7 @@ public function testHorizontalAlignMultipleCheckboxControlContainerOptionsWithEr
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -1014,7 +1014,7 @@ public function testHorizontalAlignMultipleCheckboxControlNestedInputWithError()
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -1542,7 +1542,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineWithError()
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -1693,7 +1693,7 @@ public function testHorizontalAlignMultipleCheckboxControlInlineContainerOptions
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -2079,7 +2079,7 @@ public function testHorizontalAlignMultipleCheckboxControlOptionGroupsWithError(
                             '/label',
                         '/div',
                      '/fieldset',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RadioControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RadioControlTest.php
index 41c4b0f4..c3824dc8 100644
--- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RadioControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RadioControlTest.php
@@ -538,7 +538,7 @@ public function testHorizontalAlignRadioControlWithError()
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -614,7 +614,7 @@ public function testHorizontalAlignRadioControlWithErrorAndHelp()
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -698,7 +698,7 @@ public function testHorizontalAlignRadioControlWithErrorAndHelpOptions()
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => [
@@ -856,7 +856,7 @@ public function testHorizontalAlignRadioControlContainerOptionsWithError()
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -995,7 +995,7 @@ public function testHorizontalAlignRadioControlNestedInputWithError()
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -1504,7 +1504,7 @@ public function testHorizontalAlignRadioControlInlineWithError()
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -1657,7 +1657,7 @@ public function testHorizontalAlignRadioControlInlineContainerOptionsWithError()
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -1798,7 +1798,7 @@ public function testHorizontalAlignRadioControlInlineNestedInputWithError()
                             'option 2',
                         '/label',
                     '/div',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RangeControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RangeControlTest.php
index 31f96fd5..f7b57a0a 100644
--- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RangeControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RangeControlTest.php
@@ -384,7 +384,7 @@ public function testHorizontalAlignRangeControlWithError()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'height-error',
                     ],
-                    ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -431,7 +431,7 @@ public function testHorizontalAlignRangeControlWithErrorAndHelp()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'height-error height-help',
                     ],
-                    ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => ['id' => 'height-help', 'class' => 'form-text']],
@@ -486,7 +486,7 @@ public function testHorizontalAlignRangeControlWithErrorAndHelpOptions()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'height-error custom-help',
                     ],
-                    ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => [
@@ -591,7 +591,7 @@ public function testHorizontalAlignRangeControlContainerOptionsWithError()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'height-error',
                     ],
-                    ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/SelectControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/SelectControlTest.php
index 741a946b..9dc5b406 100644
--- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/SelectControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/SelectControlTest.php
@@ -437,7 +437,7 @@ public function testHorizontalAlignSelectControlWithError()
                             'option 2',
                         '/option',
                     '/select',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -488,7 +488,7 @@ public function testHorizontalAlignSelectControlWithErrorAndHelp()
                             'option 2',
                         '/option',
                     '/select',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -547,7 +547,7 @@ public function testHorizontalAlignSelectControlWithErrorAndHelpOptions()
                             'option 2',
                         '/option',
                     '/select',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => [
@@ -656,7 +656,7 @@ public function testHorizontalAlignSelectControlContainerOptionsWithError()
                             'option 2',
                         '/option',
                     '/select',
-                    ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/StaticControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/StaticControlTest.php
index b52395dc..e4439c52 100644
--- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/StaticControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/StaticControlTest.php
@@ -413,7 +413,7 @@ public function testHorizontalAlignStaticControlWithError()
                         'aria-describedby' => 'title-error',
                         'value' => 'title',
                     ],
-                    ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -460,7 +460,7 @@ public function testHorizontalAlignStaticControlWithErrorAndHelp()
                         'aria-describedby' => 'title-error title-help',
                         'value' => 'title',
                     ],
-                    ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => ['id' => 'title-help', 'class' => 'form-text']],
@@ -515,7 +515,7 @@ public function testHorizontalAlignStaticControlWithErrorAndHelpOptions()
                         'aria-describedby' => 'title-error custom-help',
                         'value' => 'title',
                     ],
-                    ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => [
@@ -620,7 +620,7 @@ public function testHorizontalAlignStaticControlContainerOptionsWithError()
                         'aria-describedby' => 'title-error',
                         'value' => 'title',
                     ],
-                    ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
diff --git a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/TextControlTest.php b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/TextControlTest.php
index c705441d..f0f03ecd 100644
--- a/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/TextControlTest.php
+++ b/tests/TestCase/View/Helper/FormHelper/HorizontalAlign/TextControlTest.php
@@ -438,7 +438,7 @@ public function testHorizontalAlignTextControlWithError()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'title-error',
                     ],
-                    ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -479,7 +479,7 @@ public function testHorizontalAlignTextControlWithErrorAndHelp()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'title-error title-help',
                     ],
-                    ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => ['id' => 'title-help', 'class' => 'form-text']],
@@ -528,7 +528,7 @@ public function testHorizontalAlignTextControlWithErrorAndHelpOptions()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'title-error custom-help',
                     ],
-                    ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                     ['div' => [
@@ -624,7 +624,7 @@ public function testHorizontalAlignTextControlContainerOptionsWithError()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'title-error',
                     ],
-                    ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
diff --git a/tests/TestCase/View/Helper/FormHelperTest.php b/tests/TestCase/View/Helper/FormHelperTest.php
index 0514a9be..a4987f9b 100644
--- a/tests/TestCase/View/Helper/FormHelperTest.php
+++ b/tests/TestCase/View/Helper/FormHelperTest.php
@@ -474,7 +474,7 @@ public function testAddOnWithError()
                         'aria-describedby' => 'title-error',
                     ],
                 '/div',
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -500,7 +500,7 @@ public function testAddOnWithError()
                         '@',
                     '/span',
                 '/div',
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1053,7 +1053,7 @@ public function testOverrideFeedbackStyleFromHelperConfigViaControlConfig()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'title-error',
                 ],
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1198,7 +1198,7 @@ public function testInlineAlignControlWithDefaultFeedbackStyle()
                         'aria-invalid' => 'true',
                         'aria-describedby' => 'title-error',
                     ],
-                    ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                    ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                         'error message',
                     '/div',
                 '/div',
@@ -1302,7 +1302,7 @@ public function testOverrideAriaAttributes()
                     'required' => 'required',
                     'aria-describedby' => 'custom',
                 ],
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1338,7 +1338,7 @@ public function testPartiallyOverrideAriaAttributes()
                     'required' => 'required',
                     'aria-describedby' => 'custom',
                 ],
-                ['div' => ['id' => 'title-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'title-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',