diff --git a/rhodecode/tests/functional/test_compare.py b/rhodecode/tests/functional/test_compare.py
--- a/rhodecode/tests/functional/test_compare.py
+++ b/rhodecode/tests/functional/test_compare.py
@@ -226,7 +226,7 @@ class TestCompareController:
 
         response.mustcontain("Repositories unrelated.")
 
-    @pytest.mark.xfail_backends("svn", "git")
+    @pytest.mark.xfail_backends("svn")
     def test_compare_cherry_pick_commits_from_bottom(self, backend):
 
         # repo1:
@@ -277,10 +277,10 @@ class TestCompareController:
                 repo_name=repo2.repo_name,
                 source_ref_type="rev",
                 # parent of commit2, in target repo2
-                source_ref=commit1.short_id,
+                source_ref=commit1.raw_id,
                 target_repo=repo1.repo_name,
                 target_ref_type="rev",
-                target_ref=commit4.short_id,
+                target_ref=commit4.raw_id,
                 merge='1',))
         response.mustcontain('%s@%s' % (repo2.repo_name, commit1.short_id))
         response.mustcontain('%s@%s' % (repo1.repo_name, commit4.short_id))
@@ -293,7 +293,7 @@ class TestCompareController:
             ('file1', 'a_c--826e8142e6ba'),
         ])
 
-    @pytest.mark.xfail_backends("svn", "git")
+    @pytest.mark.xfail_backends("svn")
     def test_compare_cherry_pick_commits_from_top(self, backend):
         # repo1:
         #     commit0:
@@ -343,9 +343,9 @@ class TestCompareController:
                 repo_name=repo1.repo_name,
                 source_ref_type="rev",
                 # parent of commit3, not in source repo2
-                source_ref=commit2.short_id,
+                source_ref=commit2.raw_id,
                 target_ref_type="rev",
-                target_ref=commit5.short_id,
+                target_ref=commit5.raw_id,
                 merge='1',))
 
         response.mustcontain('%s@%s' % (repo1.repo_name, commit2.short_id))