diff --git a/tests/test_progit_flask_ui_app.py b/tests/test_progit_flask_ui_app.py
index d7b2d28..cdaf071 100644
--- a/tests/test_progit_flask_ui_app.py
+++ b/tests/test_progit_flask_ui_app.py
@@ -154,7 +154,7 @@ class PagureFlaskApptests(tests.Modeltests):
                 '<td class="errors">This field is required.</td>'
                 in output.data)
 
-            data['name'] = 'project#1'
+            data['name'] = 'project-1'
             output = self.app.post('/new/', data=data)
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<h2>New project</h2>' in output.data)
@@ -177,20 +177,20 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<p>Project #1</p>' in output.data)
             self.assertTrue(
-                '<li class="message">Project &#34;project#1&#34; created</li>'
+                '<li class="message">Project &#34;project-1&#34; created</li>'
                 in output.data)
 
         # After
         projects = pagure.lib.search_projects(self.session)
         self.assertEqual(len(projects), 1)
         self.assertTrue(os.path.exists(
-            os.path.join(tests.HERE, 'project#1.git')))
+            os.path.join(tests.HERE, 'project-1.git')))
         self.assertTrue(os.path.exists(
-            os.path.join(tests.HERE, 'tickets', 'project#1.git')))
+            os.path.join(tests.HERE, 'tickets', 'project-1.git')))
         self.assertTrue(os.path.exists(
-            os.path.join(tests.HERE, 'docs', 'project#1.git')))
+            os.path.join(tests.HERE, 'docs', 'project-1.git')))
         self.assertTrue(os.path.exists(
-            os.path.join(tests.HERE, 'requests', 'project#1.git')))
+            os.path.join(tests.HERE, 'requests', 'project-1.git')))
 
     @patch('pagure.ui.app.admin_session_timedout')
     def test_user_settings(self, ast):
diff --git a/tests/test_progit_flask_ui_groups.py b/tests/test_progit_flask_ui_groups.py
index c04a1cb..dd749ff 100644
--- a/tests/test_progit_flask_ui_groups.py
+++ b/tests/test_progit_flask_ui_groups.py
@@ -88,7 +88,7 @@ class PagureFlaskGroupstests(tests.Modeltests):
                 'This field is required.'), 1)
 
             data = {
-                'group_name': 'test group',
+                'group_name': 'test_group',
             }
 
             # Missing CSRF
@@ -100,17 +100,7 @@ class PagureFlaskGroupstests(tests.Modeltests):
 
             data['csrf_token'] = csrf_token
 
-            # Space in the group
-            output = self.app.post(
-                '/group/add', data=data)
-            self.assertEqual(output.status_code, 200)
-            self.assertIn('<h2>Create group</h2>', output.data)
-            self.assertIn(
-                '<li class="error">Spaces are not allowed in group names: '
-                'test group</li>' , output.data)
-
             # All good
-            data['group_name'] = 'test_group'
             output = self.app.post(
                 '/group/add', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 200)
diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py
index c0001ec..a34c61c 100644
--- a/tests/test_progit_flask_ui_issues.py
+++ b/tests/test_progit_flask_ui_issues.py
@@ -486,7 +486,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             data = {
                 'csrf_token': csrf_token,
                 'status': 'Fixed',
-                'tag': 'tag#2',
+                'tag': 'tag2',
             }
             output = self.app.post(
                 '/test/issue/1/update', data=data, follow_redirects=True)
@@ -495,7 +495,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '<p>test project<a href="/test/issue/1"> #1</a></p>'
                 in output.data)
             self.assertTrue(
-                '<li class="message">Tag added: tag#2</li>' in output.data)
+                '<li class="message">Tag added: tag2</li>' in output.data)
             self.assertFalse(
                 'li class="message">No changes to edit</li>' in output.data)
             self.assertTrue(