diff --git a/tests/test_pagure_flask_internal.py b/tests/test_pagure_flask_internal.py
index 1310264..74bf72b 100644
--- a/tests/test_pagure_flask_internal.py
+++ b/tests/test_pagure_flask_internal.py
@@ -1414,9 +1414,11 @@ class PagureFlaskInternaltests(tests.Modeltests):
 
         output = self.app.get(js_data['url'])
         js_data2 = json.loads(output.data.decode('utf-8'))
-        self.assertDictEqual(
-            js_data2,
-            {u'results': u"Reference 'refs/heads/master' not found"}
+        self.assertTrue(
+            js_data2 in [
+                {u'results': u"reference 'refs/heads/master' not found"},
+                {u'results': u"Reference 'refs/heads/master' not found"}
+            ]
         )
 
     def test_get_stats_commits_git_populated(self):
@@ -1526,9 +1528,11 @@ class PagureFlaskInternaltests(tests.Modeltests):
 
         output = self.app.get(js_data['url'])
         js_data2 = json.loads(output.data.decode('utf-8'))
-        self.assertDictEqual(
-            js_data2,
-            {u'results': u"Reference 'refs/heads/master' not found"}
+        self.assertTrue(
+            js_data2 in [
+                {u'results': u"reference 'refs/heads/master' not found"},
+                {u'results': u"Reference 'refs/heads/master' not found"}
+            ]
         )
 
     def test_get_stats_commits_trend_git_populated(self):
diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py
index ba528a2..53c1149 100644
--- a/tests/test_pagure_flask_ui_fork.py
+++ b/tests/test_pagure_flask_ui_fork.py
@@ -89,6 +89,7 @@ class PagureFlaskForktests(tests.Modeltests):
             # list of binary strings representing parents of the new commit
             []
         )
+        time.sleep(1)
         refname = 'refs/heads/master:refs/heads/master'
         ori_remote = clone_repo.remotes[0]
         PagureRepo.push(ori_remote, refname)
@@ -2189,8 +2190,8 @@ index 0000000..2a552bb
             commits = _get_commits(output.data)
             self.assertEqual(commits, [
                 'Merge #1 `PR from the feature branch`',
-                'Add sources file for testing',
                 'A commit on branch feature',
+                'Add sources file for testing',
             ])
 
             # Check if the closing notification was added
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index c4acb59..8b40fd5 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -14,6 +14,7 @@ import pkg_resources
 from unittest.case import SkipTest
 import json
 import unittest
+import urlparse
 import shutil
 import sys
 import os
@@ -708,26 +709,38 @@ class PagureFlaskIssuestests(tests.Modeltests):
         # down next to the Opened column
         th_elements = re.findall(r'<th (?:id|class)=".*?">(.*?)</th>',
                                  output.data, re.M | re.S)
-        href = ('href="/test/issues?status=Open&amp;order_key=title&amp;'
-                'order=desc"')
-        self.assertIn(href, th_elements[0])
-        href = ('/test/issues?status=Open&amp;order_key=date_created&amp;'
-                'order=asc"')
-        self.assertIn(href, th_elements[1])
+        self.assertDictEqual(
+            {'status': ['Open'], 'order_key': ['title'], 'order': ['desc']},
+            urlparse.parse_qs(urlparse.urlparse(
+                th_elements[0].split('"')[1]).query)
+        )
+        self.assertDictEqual(
+            {'status': ['Open'], 'order_key': ['date_created'], 'order': ['asc']},
+            urlparse.parse_qs(urlparse.urlparse(
+                th_elements[1].split('"')[1]).query)
+        )
         arrow = '<span class="oi" data-glyph="arrow-thick-bottom"></span>'
         self.assertIn(arrow, th_elements[1])
-        href = ('href="/test/issues?status=Open&amp;order_key=last_updated&'
-                'amp;order=desc"')
-        self.assertIn(href, th_elements[2])
-        href = ('href="/test/issues?status=Open&amp;order_key=priority&amp;'
-                'order=desc"')
-        self.assertIn(href, th_elements[3])
-        href = ('href="/test/issues?status=Open&amp;order_key=user&amp;'
-                'order=desc"')
-        self.assertIn(href, th_elements[4])
-        href = ('href="/test/issues?status=Open&amp;order_key=assignee&amp;'
-                'order=desc"')
-        self.assertIn(href, th_elements[5])
+        self.assertDictEqual(
+            {'status': ['Open'], 'order_key': ['last_updated'], 'order': ['desc']},
+            urlparse.parse_qs(urlparse.urlparse(
+                th_elements[2].split('"')[1]).query)
+        )
+        self.assertDictEqual(
+            {'status': ['Open'], 'order_key': ['priority'], 'order': ['desc']},
+            urlparse.parse_qs(urlparse.urlparse(
+                th_elements[3].split('"')[1]).query)
+        )
+        self.assertDictEqual(
+            {'status': ['Open'], 'order_key': ['user'], 'order': ['desc']},
+            urlparse.parse_qs(urlparse.urlparse(
+                th_elements[4].split('"')[1]).query)
+        )
+        self.assertDictEqual(
+            {'status': ['Open'], 'order_key': ['assignee'], 'order': ['desc']},
+            urlparse.parse_qs(urlparse.urlparse(
+                th_elements[5].split('"')[1]).query)
+        )
 
         # Status = closed (all but open)
         output = self.app.get('/test/issues?status=cloSED')
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 13e091e..2de46a5 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -1863,11 +1863,13 @@ class PagureFlaskRepotests(tests.Modeltests):
         tests.add_commit_git_repo(
             os.path.join(self.path, 'repos', 'test.git'), ncommits=1)
         c1 = repo.revparse_single('HEAD')
+        time.sleep(1)
 
         # Add another commit to git repo
         tests.add_commit_git_repo(
             os.path.join(self.path, 'repos', 'test.git'), ncommits=1)
         c2 = repo.revparse_single('HEAD')
+        time.sleep(1)
 
         # Add one more commit to git repo
         tests.add_commit_git_repo(
diff --git a/tests/test_pagure_lib_git_diff_pr.py b/tests/test_pagure_lib_git_diff_pr.py
index a82407e..a42af03 100644
--- a/tests/test_pagure_lib_git_diff_pr.py
+++ b/tests/test_pagure_lib_git_diff_pr.py
@@ -107,6 +107,7 @@ class PagureFlaskForkPrtests(tests.Modeltests):
                 # list of binary strings representing parents of the new commit
                 parents
             )
+            time.sleep(1)
 
         # Push to the main repo
         refname = 'refs/heads/master:refs/heads/master'
@@ -142,6 +143,7 @@ class PagureFlaskForkPrtests(tests.Modeltests):
                 # list of binary strings representing parents of the new commit
                 [last_commit.oid.hex]
             )
+            time.sleep(1)
         # Push to the main repo
         refname = 'refs/heads/master:refs/heads/master'
         ori_remote = clone_repo.remotes[0]
@@ -174,6 +176,7 @@ class PagureFlaskForkPrtests(tests.Modeltests):
             # list of binary strings representing parents of the new commit
             [last_commit.oid.hex]
         )
+        time.sleep(1)
 
         with open(os.path.join(repopath, 'sources'), 'w') as stream:
                 stream.write('foo\n bar\nbaz\n')
diff --git a/tests/test_pagure_lib_gitolite_config.py b/tests/test_pagure_lib_gitolite_config.py
index fa2c845..6b64a13 100644
--- a/tests/test_pagure_lib_gitolite_config.py
+++ b/tests/test_pagure_lib_gitolite_config.py
@@ -728,7 +728,7 @@ repo requests/test
         pagure.lib.SESSIONMAKER = self.session.session_factory
 
         pagure.lib.tasks.generate_gitolite_acls(
-            self=None, namespace=None, name='test', user=None, group=None)
+            namespace=None, name='test', user=None, group=None)
 
         get_helper.assert_called_with('gitolite3')
         args = helper.generate_acls.call_args