diff --git a/tests/test_pagure_flask_ui_plugins_mail.py b/tests/test_pagure_flask_ui_plugins_mail.py
index 1fb07cd..7e814fd 100644
--- a/tests/test_pagure_flask_ui_plugins_mail.py
+++ b/tests/test_pagure_flask_ui_plugins_mail.py
@@ -103,15 +103,18 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest):
                 'Hook activated', output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="mail_to" name="mail_to" '
-                    'required type="text" value=""></td>\n<td class="errors">'
-                    'This field is required.</td>', output_text)
+                    '<div class="col-sm-10">\n        '
+                    '<input class="form-control pl-0" id="mail_to" name="mail_to" '
+                    'required type="text" value="">\n    </div>\n  </div>\n      '
+                    '<div class="alert alert-danger">This field is required.</div>',
+                    output_text)
             else:
                 self.assertIn(
                     '<div class="col-sm-10">\n        '
                     '<input class="form-control pl-0" id="mail_to" name="mail_to" '
                     'type="text" value="">\n    </div>\n  </div>\n      '
-                    '<div class="alert alert-danger">This field is required.</div>', output_text)
+                    '<div class="alert alert-danger">This field is required.</div>',
+                    output_text)
             self.assertIn(
                 '<input checked class="form-check-input mt-2" id="active" name="active" '
                 'type="checkbox" value="y">', output_text)
diff --git a/tests/test_pagure_flask_ui_plugins_mirror.py b/tests/test_pagure_flask_ui_plugins_mirror.py
index 3408011..eb781b8 100644
--- a/tests/test_pagure_flask_ui_plugins_mirror.py
+++ b/tests/test_pagure_flask_ui_plugins_mirror.py
@@ -126,16 +126,19 @@ class PagureFlaskPluginMirrortests(tests.Modeltests):
                 output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<td><input class="form-check-input mt-2" id="target" name="target" '
-                    'required type="text" value="https://host.org/target">'
-                    '</td>\n<td class="errors">Invalid input.</td>',
-                    output_text)
+                    '<div class="col-sm-10">\n        '
+                    '<input class="form-control pl-0" id="target" name="target" '
+                    'required type="text" value="https://host.org/target">\n'
+                    '    </div>\n  '
+                    '</div>\n      <div class="alert alert-danger">Invalid '
+                    'input.</div>', output_text)
             else:
                 self.assertIn(
                     '<div class="col-sm-10">\n        '
                     '<input class="form-control pl-0" id="target" name="target" '
                     'type="text" value="https://host.org/target">\n    </div>\n  '
-                    '</div>\n      <div class="alert alert-danger">Invalid input.</div>', output_text)
+                    '</div>\n      <div class="alert alert-danger">Invalid '
+                    'input.</div>', output_text)
 
             output = self.app.get('/test/settings/Mirroring', data=data)
             output_text = output.get_data(as_text=True)
diff --git a/tests/test_pagure_flask_ui_plugins_noff.py b/tests/test_pagure_flask_ui_plugins_noff.py
index b6359e9..8de5a2c 100644
--- a/tests/test_pagure_flask_ui_plugins_noff.py
+++ b/tests/test_pagure_flask_ui_plugins_noff.py
@@ -44,8 +44,8 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 'Pagure</title>', output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="branches" name="branches" '
-                    'required type="text" value=""></td>', output_text)
+                    '<input class="form-control pl-0" id="branches" name="branches" '
+                    'required type="text" value="">', output_text)
             else:
                 self.assertIn(
                     '<input class="form-control pl-0" id="branches" name="branches" '
@@ -68,8 +68,8 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 'Pagure</title>', output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="branches" name="branches" '
-                    'required type="text" value=""></td>', output_text)
+                    '<input class="form-control pl-0" id="branches" name="branches" '
+                    'required type="text" value="">', output_text)
             else:
                 self.assertIn(
                     '<input class="form-control pl-0" id="branches" name="branches" '
@@ -102,8 +102,8 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 'Pagure</title>', output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="branches" name="branches" '
-                    'required type="text" value=""></td>', output_text)
+                    '<input class="form-control pl-0" id="branches" name="branches" '
+                    'required type="text" value="">', output_text)
             else:
                 self.assertIn(
                     '<input class="form-control pl-0" id="branches" name="branches" '
@@ -131,8 +131,8 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="branches" name="branches" '
-                    'required type="text" value=""></td>', output_text)
+                    '<input class="form-control pl-0" id="branches" name="branches" '
+                    'required type="text" value="">', output_text)
             else:
                 self.assertIn(
                     '<input class="form-control pl-0" id="branches" name="branches" '
@@ -172,8 +172,8 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 'Pagure</title>', output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="branches" name="branches" '
-                    'required type="text" value="master"></td>', output_text)
+                    '<input class="form-control pl-0" id="branches" name="branches" '
+                    'required type="text" value="master">', output_text)
             else:
                 self.assertIn(
                     '<input class="form-control pl-0" id="branches" name="branches" '
@@ -208,7 +208,7 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 'Pagure</title>', output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="branches" name="branches" '
+                    '<input class="form-control pl-0" id="branches" name="branches" '
                     'required type="text" value="">', output_text)
             else:
                 self.assertIn(
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ci.py b/tests/test_pagure_flask_ui_plugins_pagure_ci.py
index fedd795..1e7a98a 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_ci.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_ci.py
@@ -179,14 +179,16 @@ class PagureFlaskPluginPagureCItests(tests.SimplePagureTest):
 
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<td><input class="form-control" id="ci_url" '
-                    'name="ci_url" required type="text" value="">'
-                    '</td>\n<td class="errors">This field is required.</td>',
+                    '<div class="col-sm-10">\n        '
+                    '<input class="form-control pl-0" id="ci_url" name="ci_url" '
+                    'required type="text" value="">\n    </div>\n  </div>\n      '
+                    '<div class="alert alert-danger">This field is required.</div>',
                     output_text)
                 self.assertIn(
-                    '<td><input class="form-control" id="ci_job" '
-                    'name="ci_job" required type="text" value="">'
-                    '</td>\n<td class="errors">This field is required.</td>',
+                    '<div class="col-sm-10">\n        '
+                    '<input class="form-control pl-0" id="ci_job" name="ci_job" '
+                    'required type="text" value="">\n    </div>\n  </div>\n      '
+                    '<div class="alert alert-danger">This field is required.</div>',
                     output_text)
             else:
                 self.assertIn(