diff --git a/pagure/lib/tasks_services.py b/pagure/lib/tasks_services.py
index f8c4f0c..9248661 100644
--- a/pagure/lib/tasks_services.py
+++ b/pagure/lib/tasks_services.py
@@ -333,7 +333,7 @@ def load_json_commits_to_db(
 
 @conn.task(queue=pagure_config.get('CI_CELERY_QUEUE', None), bind=True)
 @pagure_task
-def trigger_ci_build(self, project_name, pr_id, branch, ci_type):
+def trigger_ci_build(self, session, project_name, pr_id, branch, ci_type):
 
     ''' Triggers a new run of the CI system on the specified pull-request.
 
diff --git a/tests/test_pagure_flask_ui_plugins.py b/tests/test_pagure_flask_ui_plugins.py
index 9254e42..69d18b4 100644
--- a/tests/test_pagure_flask_ui_plugins.py
+++ b/tests/test_pagure_flask_ui_plugins.py
@@ -9,17 +9,11 @@
 """
 
 __requires__ = ['SQLAlchemy >= 0.8']
-import pkg_resources
 
-import json
 import unittest
-import shutil
 import sys
 import os
-
-import pygit2
 import wtforms
-from mock import patch
 
 sys.path.insert(0, os.path.join(os.path.dirname(
     os.path.abspath(__file__)), '..'))
@@ -90,7 +84,7 @@ class PagureFlaskPluginstests(tests.SimplePagureTest):
                 '<form action="/test/settings/Mail" method="post">',
                 output.data)
             self.assertIn(
-                '<td><label for="mail_to">Mail to</label></td>',
+                '<label for="mail_to">Mail to</label>',
                 output.data)
 
             csrf_token = output.data.split(
diff --git a/tests/test_pagure_flask_ui_plugins_fedmsg.py b/tests/test_pagure_flask_ui_plugins_fedmsg.py
index 1e91b2d..a69f6d4 100644
--- a/tests/test_pagure_flask_ui_plugins_fedmsg.py
+++ b/tests/test_pagure_flask_ui_plugins_fedmsg.py
@@ -9,15 +9,11 @@
 """
 
 __requires__ = ['SQLAlchemy >= 0.8']
-import pkg_resources
 
-import json
 import unittest
-import shutil
 import sys
 import os
 
-import pygit2
 from mock import patch
 
 sys.path.insert(0, os.path.join(os.path.dirname(
@@ -50,8 +46,8 @@ class PagureFlaskPluginFedmsgtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Fedmsg settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             csrf_token = self.get_csrf(output=output)
 
@@ -64,8 +60,8 @@ class PagureFlaskPluginFedmsgtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Fedmsg settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
@@ -101,8 +97,8 @@ class PagureFlaskPluginFedmsgtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertIn('<h3>Fedmsg settings</h3>', output.data)
             self.assertIn(
-                '<input id="active" name="active" type="checkbox" value="y">',
-                output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">', output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
@@ -142,8 +138,8 @@ class PagureFlaskPluginFedmsgtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Fedmsg settings</h3>' in output.data)
             self.assertTrue(
-                '<input checked id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input checked class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
@@ -180,8 +176,8 @@ class PagureFlaskPluginFedmsgtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Fedmsg settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
diff --git a/tests/test_pagure_flask_ui_plugins_irc.py b/tests/test_pagure_flask_ui_plugins_irc.py
index ec4ceb5..df12148 100644
--- a/tests/test_pagure_flask_ui_plugins_irc.py
+++ b/tests/test_pagure_flask_ui_plugins_irc.py
@@ -9,17 +9,10 @@
 """
 
 __requires__ = ['SQLAlchemy >= 0.8']
-import pkg_resources
-
-import json
 import unittest
-import shutil
 import sys
 import os
 
-import pygit2
-from mock import patch
-
 sys.path.insert(0, os.path.join(os.path.dirname(
     os.path.abspath(__file__)), '..'))
 
@@ -45,8 +38,8 @@ class PagureFlaskPluginIRCtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -60,8 +53,8 @@ class PagureFlaskPluginIRCtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks', 'post-receive.irc')))
@@ -85,8 +78,8 @@ class PagureFlaskPluginIRCtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks', 'post-receive.irc')))
@@ -116,8 +109,8 @@ class PagureFlaskPluginIRCtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
-                '<input checked id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input checked class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             # TODO: Fix this
             #self.assertTrue(os.path.exists(os.path.join(
@@ -140,8 +133,8 @@ class PagureFlaskPluginIRCtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>IRC settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks', 'post-receive.irc')))
diff --git a/tests/test_pagure_flask_ui_plugins_mail.py b/tests/test_pagure_flask_ui_plugins_mail.py
index cfdd42a..fe892bb 100644
--- a/tests/test_pagure_flask_ui_plugins_mail.py
+++ b/tests/test_pagure_flask_ui_plugins_mail.py
@@ -9,16 +9,11 @@
 """
 
 __requires__ = ['SQLAlchemy >= 0.8']
-import pkg_resources
 
-import json
 import unittest
-import shutil
 import sys
 import os
 
-import pygit2
-from mock import patch
 
 sys.path.insert(0, os.path.join(os.path.dirname(
     os.path.abspath(__file__)), '..'))
@@ -45,11 +40,11 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
-                '<td><label for="mail_to">Mail to</label></td>'
+                '<label for="mail_to">Mail to</label>'
                 in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -63,11 +58,11 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
-                '<td><label for="mail_to">Mail to</label></td>'
+                '<label for="mail_to">Mail to</label>'
                 in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             data['csrf_token'] = csrf_token
 
@@ -88,11 +83,11 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
-                '<td><label for="mail_to">Mail to</label></td>'
+                '<label for="mail_to">Mail to</label>'
                 in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+               '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks', 'post-receive.mail')))
@@ -110,12 +105,12 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest):
             self.assertFalse(
                 '</button>\n                      Hook activated' in output.data)
             self.assertTrue(
-                '<input id="mail_to" name="mail_to" type="text" value=""></td>'
-                '\n<td class="errors">This field is required.</td>'
-                in output.data)
+                '<input class="form-control" id="mail_to" name="mail_to" '
+                'type="text" value=""></td>\n<td class="errors">'
+                'This field is required.</td>' in output.data)
             self.assertTrue(
-                '<input checked id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input checked class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks', 'post-receive.mail')))
@@ -142,11 +137,11 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
-                '<td><label for="mail_to">Mail to</label></td>'
+                '<label for="mail_to">Mail to</label>'
                 in output.data)
             self.assertTrue(
-                '<input checked id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input checked class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertTrue(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks', 'post-receive.mail')))
@@ -168,11 +163,11 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Mail settings</h3>' in output.data)
             self.assertTrue(
-                '<td><label for="mail_to">Mail to</label></td>'
+                '<label for="mail_to">Mail to</label>'
                 in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks', 'post-receive.mail')))
diff --git a/tests/test_pagure_flask_ui_plugins_noff.py b/tests/test_pagure_flask_ui_plugins_noff.py
index 2cf4d03..491cf99 100644
--- a/tests/test_pagure_flask_ui_plugins_noff.py
+++ b/tests/test_pagure_flask_ui_plugins_noff.py
@@ -9,16 +9,11 @@
 """
 
 __requires__ = ['SQLAlchemy >= 0.8']
-import pkg_resources
 
-import json
 import unittest
-import shutil
 import sys
 import os
 
-import pygit2
-from mock import patch
 
 sys.path.insert(0, os.path.join(os.path.dirname(
     os.path.abspath(__file__)), '..'))
@@ -48,11 +43,11 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 '<h3>Block non fast-forward pushes settings</h3>',
                 output.data)
             self.assertIn(
-                '<td><input id="branches" name="branches" type="text" '
-                'value=""></td>', output.data)
+                '<input class="form-control" id="branches" name="branches" '
+                'type="text" value=""></td>', output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -69,11 +64,11 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 '<h3>Block non fast-forward pushes settings</h3>',
                 output.data)
             self.assertIn(
-                '<td><input id="branches" name="branches" type="text" '
-                'value=""></td>', output.data)
+                '<input class="form-control" id="branches" name="branches" '
+                'type="text" value="">', output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             data['csrf_token'] = csrf_token
 
@@ -99,11 +94,11 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 '<h3>Block non fast-forward pushes settings</h3>',
                 output.data)
             self.assertIn(
-                '<td><input id="branches" name="branches" type="text" '
-                'value=""></td>', output.data)
+                '<input class="form-control" id="branches" name="branches" '
+                'type="text" value="">', output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks', 'post-receive.mail')))
@@ -125,11 +120,11 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 '</button>\n                      Hook activated',
                 output.data)
             self.assertIn(
-                '<td><input id="branches" name="branches" type="text" '
-                'value=""></td>', output.data)
+                '<input class="form-control" id="branches" name="branches" '
+                'type="text" value="">', output.data)
             self.assertTrue(
-                '<input checked id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input checked class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
@@ -162,11 +157,11 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 '<h3>Block non fast-forward pushes settings</h3>',
                 output.data)
             self.assertIn(
-                '<td><input id="branches" name="branches" type="text" '
-                'value="master"></td>', output.data)
+                '<input class="form-control" id="branches" name="branches" '
+                'type="text" value="master">', output.data)
             self.assertIn(
-                '<input checked id="active" name="active" type="checkbox" '
-                'value="y">', output.data)
+                '<input checked class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">', output.data)
 
             self.assertTrue(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
@@ -194,11 +189,11 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 '<h3>Block non fast-forward pushes settings</h3>',
                 output.data)
             self.assertIn(
-                '<td><input id="branches" name="branches" type="text" '
-                'value=""></td>', output.data)
+                '<input class="form-control" id="branches" name="branches" '
+                'type="text" value="">', output.data)
             self.assertIn(
-                '<input id="active" name="active" type="checkbox" '
-                'value="y">', output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">', output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ci.py b/tests/test_pagure_flask_ui_plugins_pagure_ci.py
index b2fd1ad..302c34d 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_ci.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_ci.py
@@ -1,17 +1,11 @@
 # -*- coding: utf-8 -*-
 
 __requires__ = ['SQLAlchemy >= 0.8']
-import pkg_resources
 
-import json
 import unittest
-import shutil
 import sys
 import os
 
-import pygit2
-from mock import patch
-
 # Insert the PAGURE_CONFIG env variable before we do the imports
 HERE = os.path.join(os.path.dirname(os.path.abspath(__file__)))
 CONFIG = os.path.join(HERE, 'test_config')
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_hook.py
index 2af3779..738b5db 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_hook.py
@@ -9,15 +9,11 @@
 """
 
 __requires__ = ['SQLAlchemy >= 0.8']
-import pkg_resources
 
-import json
 import unittest
-import shutil
 import sys
 import os
 
-import pygit2
 from mock import patch
 
 sys.path.insert(0, os.path.join(os.path.dirname(
@@ -50,8 +46,8 @@ class PagureFlaskPluginPagureHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
     def test_plugin_mail_no_data(self):
         """ Test the pagure hook plugin endpoint when no data is sent. """
@@ -68,8 +64,8 @@ class PagureFlaskPluginPagureHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
@@ -110,8 +106,8 @@ class PagureFlaskPluginPagureHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
@@ -154,8 +150,8 @@ class PagureFlaskPluginPagureHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure settings</h3>' in output.data)
             self.assertTrue(
-                '<input checked id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input checked class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertTrue(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
@@ -195,8 +191,8 @@ class PagureFlaskPluginPagureHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
index f562221..29ba1dd 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
@@ -9,17 +9,12 @@
 """
 
 __requires__ = ['SQLAlchemy >= 0.8']
-import pkg_resources
 
-import json
 import unittest
 import shutil
 import sys
 import os
 
-import pygit2
-from mock import patch
-
 sys.path.insert(0, os.path.join(os.path.dirname(
     os.path.abspath(__file__)), '..'))
 
@@ -45,8 +40,8 @@ class PagureFlaskPluginPagureRequestHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure requests settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -60,8 +55,8 @@ class PagureFlaskPluginPagureRequestHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure requests settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             data['csrf_token'] = csrf_token
 
@@ -86,8 +81,8 @@ class PagureFlaskPluginPagureRequestHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure requests settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'requests', 'test.git', 'hooks',
@@ -117,8 +112,8 @@ class PagureFlaskPluginPagureRequestHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure requests settings</h3>' in output.data)
             self.assertTrue(
-                '<input checked id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input checked class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertTrue(os.path.exists(os.path.join(
                 self.path, 'repos', 'requests', 'test.git', 'hooks',
@@ -144,8 +139,8 @@ class PagureFlaskPluginPagureRequestHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure requests settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'requests', 'test.git', 'hooks',
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py
index 4482912..84ad2d0 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py
@@ -9,16 +9,12 @@
 """
 
 __requires__ = ['SQLAlchemy >= 0.8']
-import pkg_resources
 
-import json
 import unittest
 import shutil
 import sys
 import os
 
-import pygit2
-from mock import patch
 
 sys.path.insert(0, os.path.join(os.path.dirname(
     os.path.abspath(__file__)), '..'))
@@ -45,8 +41,8 @@ class PagureFlaskPluginPagureTicketHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure tickets settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -60,8 +56,8 @@ class PagureFlaskPluginPagureTicketHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure tickets settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             data['csrf_token'] = csrf_token
 
@@ -86,8 +82,8 @@ class PagureFlaskPluginPagureTicketHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure tickets settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'tickets', 'test.git', 'hooks',
@@ -117,8 +113,8 @@ class PagureFlaskPluginPagureTicketHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure tickets settings</h3>' in output.data)
             self.assertTrue(
-                '<input checked id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input checked class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertTrue(os.path.exists(os.path.join(
                 self.path, 'repos', 'tickets', 'test.git', 'hooks',
@@ -144,8 +140,8 @@ class PagureFlaskPluginPagureTicketHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertTrue('<h3>Pagure tickets settings</h3>' in output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" '
-                'value="y">' in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'tickets', 'test.git', 'hooks',
diff --git a/tests/test_pagure_flask_ui_plugins_rtd_hook.py b/tests/test_pagure_flask_ui_plugins_rtd_hook.py
index 2ad97d5..429b28f 100644
--- a/tests/test_pagure_flask_ui_plugins_rtd_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_rtd_hook.py
@@ -9,16 +9,11 @@
 """
 
 __requires__ = ['SQLAlchemy >= 0.8']
-import pkg_resources
-
-import json
 import unittest
 import shutil
 import sys
 import os
 
-import pygit2
-from mock import patch
 
 sys.path.insert(0, os.path.join(os.path.dirname(
     os.path.abspath(__file__)), '..'))
@@ -45,8 +40,8 @@ class PagureFlaskPluginRtdHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertIn('<h3>Read the Doc settings</h3>', output.data)
             self.assertIn(
-                '<input id="active" name="active" type="checkbox" value="y">',
-                output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">', output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -60,8 +55,8 @@ class PagureFlaskPluginRtdHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertIn('<h3>Read the Doc settings</h3>', output.data)
             self.assertIn(
-                '<input id="active" name="active" type="checkbox" value="y">',
-                output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">', output.data)
 
             data['csrf_token'] = csrf_token
 
@@ -86,8 +81,8 @@ class PagureFlaskPluginRtdHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertIn('<h3>Read the Doc settings</h3>', output.data)
             self.assertIn(
-                '<input id="active" name="active" type="checkbox" value="y">',
-                output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">', output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'requests', 'test.git', 'hooks',
@@ -118,8 +113,8 @@ class PagureFlaskPluginRtdHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertIn('<h3>Read the Doc settings</h3>', output.data)
             self.assertIn(
-                '<input checked id="active" name="active" type="checkbox" '
-                'value="y">', output.data)
+                '<input checked class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">', output.data)
 
             self.assertTrue(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
@@ -145,8 +140,8 @@ class PagureFlaskPluginRtdHooktests(tests.SimplePagureTest):
                 'test project #1        </div>', output.data)
             self.assertIn('<h3>Read the Doc settings</h3>', output.data)
             self.assertIn(
-                '<input id="active" name="active" type="checkbox" '
-                'value="y">', output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">', output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
diff --git a/tests/test_pagure_flask_ui_plugins_unsigned.py b/tests/test_pagure_flask_ui_plugins_unsigned.py
index 6bd2f68..2d15d0e 100644
--- a/tests/test_pagure_flask_ui_plugins_unsigned.py
+++ b/tests/test_pagure_flask_ui_plugins_unsigned.py
@@ -9,16 +9,11 @@
 """
 
 __requires__ = ['SQLAlchemy >= 0.8']
-import pkg_resources
 
-import json
 import unittest
-import shutil
 import sys
 import os
 
-import pygit2
-from mock import patch
 
 sys.path.insert(0, os.path.join(os.path.dirname(
     os.path.abspath(__file__)), '..'))
@@ -48,8 +43,8 @@ class PagureFlaskPluginUnsignedtests(tests.SimplePagureTest):
                 '<h3>Block Un-Signed commits settings</h3>',
                 output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -66,8 +61,8 @@ class PagureFlaskPluginUnsignedtests(tests.SimplePagureTest):
                 '<h3>Block Un-Signed commits settings</h3>',
                 output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             data['csrf_token'] = csrf_token
 
@@ -93,8 +88,8 @@ class PagureFlaskPluginUnsignedtests(tests.SimplePagureTest):
                 '<h3>Block Un-Signed commits settings</h3>',
                 output.data)
             self.assertTrue(
-                '<input id="active" name="active" type="checkbox" value="y">'
-                in output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">' in output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',
@@ -143,8 +138,8 @@ class PagureFlaskPluginUnsignedtests(tests.SimplePagureTest):
                 '<h3>Block Un-Signed commits settings</h3>',
                 output.data)
             self.assertIn(
-                '<input id="active" name="active" type="checkbox" '
-                'value="y">', output.data)
+                '<input class="form-control" id="active" name="active" '
+                'type="checkbox" value="y">', output.data)
 
             self.assertFalse(os.path.exists(os.path.join(
                 self.path, 'repos', 'test.git', 'hooks',