diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py
index a0fcd92..4ed0f56 100644
--- a/tests/test_pagure_flask_ui_app.py
+++ b/tests/test_pagure_flask_ui_app.py
@@ -637,8 +637,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>foo\'s settings - Pagure</title>', output_text)
             self.assertIn(
                 '<textarea class="form-control" id="ssh_key" name="ssh_key">'
                 '</textarea>', output_text)
@@ -653,8 +652,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>foo\'s settings - Pagure</title>', output_text)
 
             data['csrf_token'] =  csrf_token
 
@@ -664,8 +662,7 @@ class PagureFlaskApptests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn('Invalid SSH keys', output_text)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>foo\'s settings - Pagure</title>', output_text)
             self.assertIn('>blah</textarea>', output_text)
 
             csrf_token = output_text.split(
@@ -686,8 +683,7 @@ class PagureFlaskApptests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn('Public ssh key updated', output_text)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>foo\'s settings - Pagure</title>', output_text)
             self.assertIn(
                 '<textarea class="form-control" id="ssh_key" name="ssh_key">'
                 'ssh-rsa AAAA', output_text)
@@ -710,8 +706,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>foo\'s settings - Pagure</title>', output_text)
             self.assertNotIn(
                 '<textarea class="form-control" id="ssh_key" name="ssh_key">'
                 '</textarea>', output_text)
@@ -730,8 +725,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>foo\'s settings - Pagure</title>', output_text)
             self.assertNotIn(
                 '<textarea class="form-control" id="ssh_key" name="ssh_key">'
                 '</textarea>', output_text)
@@ -757,8 +751,7 @@ class PagureFlaskApptests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertNotIn('Public ssh key updated', output_text)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>foo\'s settings - Pagure</title>', output_text)
             self.assertNotIn(
                 '<textarea class="form-control" id="ssh_key" name="ssh_key">'
                 'ssh-rsa AAAA', output_text)
@@ -798,8 +791,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>foo\'s settings - Pagure</title>', output_text)
             self.assertIn(
                 '<textarea class="form-control" id="ssh_key" name="ssh_key">'
                 '</textarea>', output_text)
@@ -866,8 +858,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>foo\'s settings - Pagure</title>', output_text)
 
             csrf_token = self.get_csrf(output=output)
 
@@ -895,8 +886,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>foo\'s settings - Pagure</title>', output_text)
 
             csrf_token = self.get_csrf(output=output)
 
@@ -939,11 +929,16 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
-            self.assertIn(
-                '<textarea class="form-control form-control-error" id="ssh_key" name="ssh_key">'
-                '</textarea>', output_text)
+                '<title>foo\'s settings - Pagure</title>', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<textarea class="form-control form-control-error" '
+                    'id="ssh_key" name="ssh_key" required></textarea>',
+                    output_text)
+            else:
+                 self.assertIn(
+                    '<textarea class="form-control form-control-error" '
+                    'id="ssh_key" name="ssh_key"></textarea>', output_text)
 
             csrf_token = self.get_csrf(output=output)
 
@@ -956,8 +951,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>foo\'s settings - Pagure</title>', output_text)
             self.assertIn(
                 '</button>\n                      You must always have at '
                 'least one email', output_text)
@@ -968,11 +962,16 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
-            self.assertIn(
-                '<textarea class="form-control form-control-error" id="ssh_key" name="ssh_key">'
-                '</textarea>', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
+            if self.get_wtforms_version() >= (2, 2):
+                self.assertIn(
+                    '<textarea class="form-control form-control-error" '
+                    'id="ssh_key" name="ssh_key" required></textarea>',
+                    output_text)
+            else:
+                 self.assertIn(
+                    '<textarea class="form-control form-control-error" '
+                    'id="ssh_key" name="ssh_key"></textarea>', output_text)
 
             csrf_token = self.get_csrf(output=output)
 
@@ -985,8 +984,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertEqual(output_text.count('foo@pingou.com'), 4)
 
             data = {
@@ -999,8 +997,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertIn(
                 '</button>\n                      You do not have the '
                 'email: foobar@pingou.com, nothing to remove', output_text)
@@ -1097,8 +1094,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertIn(
                 '</button>\n                      Email pending validation',
                 output_text)
@@ -1182,8 +1178,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertIn(
                 '<textarea class="form-control" id="ssh_key" name="ssh_key">'
                 '</textarea>', output_text)
@@ -1199,8 +1194,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertEqual(output_text.count('foo@pingou.com'), 4)
 
             # Set invalid default email
@@ -1214,8 +1208,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertEqual(output_text.count('foo@pingou.com'), 4)
             self.assertIn(
                 '</button>\n                      You do not have the '
@@ -1233,8 +1226,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertEqual(output_text.count('foo@pingou.com'), 4)
             self.assertIn(
                 '</button>\n                      Default email set to: '
@@ -1277,8 +1269,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertIn(
                 '<textarea class="form-control" id="ssh_key" name="ssh_key">'
                 '</textarea>', output_text)
@@ -1294,8 +1285,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertEqual(output_text.count('foo@pingou.com'), 4)
 
             # Set invalid default email
@@ -1309,8 +1299,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertEqual(output_text.count('foo@pingou.com'), 4)
             self.assertIn(
                 '</button>\n                      This email address has '
@@ -1327,8 +1316,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertEqual(output_text.count('foo@pingou.com'), 4)
             self.assertIn(
                 '</button>\n                      Confirmation email re-sent',
@@ -1368,8 +1356,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertIn(
                 '</button>\n                      No email associated with this token.',
                 output_text)
@@ -1380,8 +1367,7 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<h3 class="font-weight-bold mb-3">\n'
-                '            Basic Information\n          </h3>\n', output_text)
+                '<title>pingou\'s settings - Pagure</title>', output_text)
             self.assertIn(
                 '</button>\n                      Email validated',
                 output_text)
@@ -1893,7 +1879,7 @@ class PagureFlaskAppNoDocstests(tests.Modeltests):
 
     def test_new_project_no_docs_folder(self):
         """ Test the new_project endpoint with DOCS_FOLDER is None. """
-        # Before    
+        # Before
         projects = pagure.lib.search_projects(self.session)
         self.assertEqual(len(projects), 0)
         self.assertFalse(os.path.exists(
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index 01fe904..dc41694 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- (c) 2015-2017 - Copyright Red Hat Inc
+ (c) 2015-2018 - Copyright Red Hat Inc
 
  Authors:
    Pierre-Yves Chibon <pingou@pingoured.fr>
@@ -3365,7 +3365,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
             # Check that the git issue URL is present
             output = self.app.get('/test')
             self.assertNotIn(
-                '<h5><strong>Issues GIT URLs</strong></h5>', output.get_data(as_text=True))
+                '<h5><strong>Issues GIT URLs</strong></h5>',
+                output.get_data(as_text=True))
 
             # Project w/o issue tracker
             repo = pagure.lib.get_authorized_project(self.session, 'test')
@@ -3379,7 +3380,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertIn(
                 '<h5><strong>Issues</strong></h5>', output_text)
             self.assertIn(
-                'value="ssh://git@pagure.org/tickets/test.git', output_text)
+                'value="ssh://git@localhost.localdomain/tickets/test.git',
+                output_text)
 
     @patch('pagure.lib.git.update_git')
     @patch('pagure.lib.notify.send_email')
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ci.py b/tests/test_pagure_flask_ui_plugins_pagure_ci.py
index 8a78f4f..b35f5b0 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_ci.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_ci.py
@@ -171,10 +171,11 @@ class PagureFlaskPluginPagureCItests(tests.SimplePagureTest):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                '<title>Settings Pagure CI - test - Pagure</title>',
+                '<title>Settings - test - Pagure</title>',
+                output_text)
+            self.assertNotIn(
+                '</button>\n                      Hook Pagure CI activated',
                 output_text)
-            self.assertFalse(
-                '</button>\n                      Hook activated' in output_text)
 
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 0f7442b..b45356f 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -1526,7 +1526,7 @@ class PagureFlaskRepotests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<input class="form-control bg-white" type="text" '
-                'value="ssh://git@pagure.org/tickets/test.git" readonly>',
+                'value="ssh://git@localhost.localdomain/tickets/test.git" readonly>',
                 output_text)
             self.assertIn('<p>This repo is brand new!</p>', output_text)
             self.assertIn(
@@ -1551,7 +1551,7 @@ class PagureFlaskRepotests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertNotIn(
                 '<input class="form-control bg-white" type="text" '
-                'value="ssh://git@pagure.org/tickets/test.git" readonly>',
+                'value="ssh://git@localhost.localdomain/tickets/test.git" readonly>',
                 output_text)
             self.assertIn('<p>This repo is brand new!</p>', output_text)
             self.assertIn(
@@ -1618,11 +1618,11 @@ class PagureFlaskRepotests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertIn(
                 '<i class="fa fa-code-fork fa-fw"></i> Fork</button>',
-                output.data)
-            self.assertFalse('<p>This repo is brand new!</p>' in output.data)
-            self.assertFalse('Forked from' in output.data)
-            self.assertFalse('README.txt' in output.data)
-            self.assertFalse('README.dummy' in output.data)
+                output_text)
+            self.assertFalse('<p>This repo is brand new!</p>' in output_text)
+            self.assertNotIn('Forked from', output_text)
+            self.assertNotIn('README.txt', output_text)
+            self.assertNotIn('README.dummy', output_text)
             self.assertIn(
             '<title>Overview - test - Pagure</title>', output_text)
             self.perfMaxWalks(3, 8)  # Target: (1, 3)
@@ -1634,11 +1634,11 @@ class PagureFlaskRepotests(tests.Modeltests):
         output_text = output.get_data(as_text=True)
         self.assertNotIn(
             '<i class="fa fa-code-fork"></i>Fork</button>',
-            output.data)
-        self.assertFalse('<p>This repo is brand new!</p>' in output.data)
-        self.assertFalse('Forked from' in output.data)
-        self.assertFalse('README.txt' in output.data)
-        self.assertFalse('README.dummy' in output.data)
+            output_text)
+        self.assertNotIn('<p>This repo is brand new!</p>', output_text)
+        self.assertNotIn('Forked from', output_text)
+        self.assertNotIn('README.txt', output_text)
+        self.assertNotIn('README.dummy', output_text)
         self.assertIn(
             '<title>Overview - test - Pagure</title>', output_text)
         self.perfMaxWalks(3, 8)  # Target: (1, 3)
@@ -1673,10 +1673,10 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertIn('Forked from', output_text)
             self.assertNotIn(
                 '<i class="fa fa-code-fork fa-fw"></i> Fork</button>',
-                output.data)
+                output_text)
             self.assertIn(
                 '<i class="fa fa-code-fork fa-fw"></i> View Upstream',
-                output.data)
+                output_text)
             self.perfMaxWalks(1, 3)
             self.perfReset()
 
@@ -1692,10 +1692,10 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertIn('Forked from', output_text)
             self.assertNotIn(
                 '<i class="fa fa-code-fork fa-fw"></i> View Upstream',
-                output.data)
+                output_text)
             self.assertIn(
                 '<i class="fa fa-code-fork fa-fw"></i> Fork</button>',
-                output.data)
+                output_text)
             self.perfMaxWalks(1, 3)
             self.perfReset()
 
@@ -1709,10 +1709,10 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertIn('Forked from', output_text)
         self.assertNotIn(
             '<i class="fa fa-code-fork"></i> View Fork',
-            output.data)
+            output_text)
         self.assertNotIn(
             '<i class="fa fa-code-fork"></i>Fork</button>',
-            output.data)
+            output_text)
         self.perfMaxWalks(1, 3)
         self.perfReset()
 
@@ -1955,7 +1955,10 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
         self.assertIn(
-            '<div class="list-group mt-1">\n      </div>',
+            '<div class="list-group my-2">\n\n\n          </div>',
+            output_text)
+        self.assertIn(
+            'Commits <span class="badge badge-secondary"> 0</span>',
             output_text)
 
         output = self.app.get('/fork/pingou/test3/commits')
@@ -1992,7 +1995,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertNotIn(latest_commit.oid.hex, output_text)
         self.assertIn('<title>Commits - test - Pagure</title>', output_text)
         self.assertEqual(
-            output_text.count('class="badge badge-secondary commithash"'), 1)
+            output_text.count('<span id="commit-actions">'), 1)
 
     def test_compare_commits(self):
         """ Test the compare_commits endpoint. """
diff --git a/tests/test_pagure_flask_ui_repo_slash_name.py b/tests/test_pagure_flask_ui_repo_slash_name.py
index 26473a7..8929908 100644
--- a/tests/test_pagure_flask_ui_repo_slash_name.py
+++ b/tests/test_pagure_flask_ui_repo_slash_name.py
@@ -98,7 +98,8 @@ class PagureFlaskSlashInNametests(tests.SimplePagureTest):
         output_text = output.get_data(as_text=True)
         self.assertIn(
             '<input class="form-control bg-white" type="text" '
-            'value="git://pagure.org/test.git" readonly>', output_text)
+            'value="git://localhost.localdomain/test.git" readonly>',
+            output_text)
         self.assertIn(
             '<p>The Project Creator has not pushed any code yet</p>',
             output_text)
@@ -142,7 +143,8 @@ class PagureFlaskSlashInNametests(tests.SimplePagureTest):
         output_text = output.get_data(as_text=True)
         self.assertIn(
             '<input class="form-control bg-white" type="text" '
-            'value="git://pagure.org/forks/test.git" readonly>', output_text)
+            'value="git://localhost.localdomain/forks/test.git" readonly>',
+            output_text)
         self.assertIn(
             '<p>The Project Creator has not pushed any code yet</p>',
             output_text)
@@ -176,7 +178,8 @@ class PagureFlaskSlashInNametests(tests.SimplePagureTest):
         output_text = output.get_data(as_text=True)
         self.assertIn(
             '<input class="form-control bg-white" type="text" '
-            'value="git://pagure.org/test.git" readonly>', output_text)
+            'value="git://localhost.localdomain/test.git" readonly>',
+            output_text)
 
         # We can't create the project `forks/test` the normal way
         self.assertRaises(
@@ -216,7 +219,8 @@ class PagureFlaskSlashInNametests(tests.SimplePagureTest):
         output_text = output.get_data(as_text=True)
         self.assertIn(
             '<input class="form-control bg-white" type="text" '
-            'value="git://pagure.org/forks/test.git" readonly>', output_text)
+            'value="git://localhost.localdomain/forks/test.git" readonly>',
+            output_text)
         self.assertIn(
             '<title>Overview - forks/test - Pagure</title>', output_text)
 
diff --git a/tests/test_pagure_flask_ui_slash_branch_name.py b/tests/test_pagure_flask_ui_slash_branch_name.py
index c9884a2..d70da62 100644
--- a/tests/test_pagure_flask_ui_slash_branch_name.py
+++ b/tests/test_pagure_flask_ui_slash_branch_name.py
@@ -123,7 +123,8 @@ class PagureFlaskSlashInBranchtests(tests.SimplePagureTest):
         output_text = output.get_data(as_text=True)
         self.assertIn(
             '<input class="form-control bg-white" type="text" '
-            'value="git://pagure.org/test.git" readonly>', output_text)
+            'value="git://localhost.localdomain/test.git" readonly>',
+            output_text)
 
     '''
     @patch('pagure.lib.notify.send_email')
@@ -146,7 +147,7 @@ class PagureFlaskSlashInBranchtests(tests.SimplePagureTest):
         output_text = output.get_data(as_text=True)
         self.assertIn(
             '<input class="form-control bg-white" type="text" '
-            'value="git://pagure.org/test.git" readonly>', output_text)
+            'value="git://localhost.localdomain/test.git" readonly>', output_text)
     '''
 
     @patch('pagure.lib.notify.send_email')