diff --git a/tests/integration/test_mdrender.py b/tests/integration/test_mdrender.py
new file mode 100644
index 00000000..cab7b28d
--- /dev/null
+++ b/tests/integration/test_mdrender.py
@@ -0,0 +1,31 @@
+import pytest
+
+from taiga.mdrender.service import render, render_and_extract
+
+from unittest.mock import MagicMock
+
+from .. import factories
+
+pytestmark = pytest.mark.django_db
+
+dummy_project = MagicMock()
+dummy_project.id = 1
+dummy_project.slug = "test"
+
+
+def test_proccessor_valid_user_mention():
+    factories.UserFactory(username="user1", first_name="test", last_name="name")
+    result = render(dummy_project, "**@user1**")
+    expected_result = "<p><strong><a alt=\"test name\" class=\"mention\" href=\"/#/profile/user1\" title=\"test name\">&commat;user1</a></strong></p>"
+    assert result == expected_result
+
+
+def test_proccessor_invalid_user_mention():
+    result = render(dummy_project, "**@notvaliduser**")
+    assert result == '<p><strong>@notvaliduser</strong></p>'
+
+
+def test_render_and_extract_mentions():
+    user = factories.UserFactory(username="user1", first_name="test", last_name="name")
+    (_, extracted) = render_and_extract(dummy_project, "**@user1**")
+    assert extracted['mentions'] == [user]
diff --git a/tests/unit/test_mdrender.py b/tests/unit/test_mdrender.py
index 90a91550..b5bc0369 100644
--- a/tests/unit/test_mdrender.py
+++ b/tests/unit/test_mdrender.py
@@ -3,8 +3,6 @@ from unittest.mock import patch, MagicMock
 from taiga.mdrender.extensions import emojify
 from taiga.mdrender.service import render, cache_by_sha, get_diff_of_htmls, render_and_extract
 
-from taiga.users.models import User
-
 from datetime import datetime
 
 dummy_project = MagicMock()
@@ -22,23 +20,6 @@ def test_proccessor_invalid_emoji():
     assert result == ["**:notvalidemoji:**"]
 
 
-def test_proccessor_valid_user_mention():
-    with patch("taiga.mdrender.extensions.mentions.User") as mock:
-        instance = mock.objects.get.return_value
-        instance.get_full_name.return_value = "test name"
-        result = render(dummy_project, "**@user1**")
-        expected_result = "<p><strong><a alt=\"test name\" class=\"mention\" href=\"/#/profile/user1\" title=\"test name\">&commat;user1</a></strong></p>"
-        assert result == expected_result
-
-
-def test_proccessor_invalid_user_mention():
-    with patch("taiga.mdrender.extensions.mentions.User") as mock:
-        mock.DoesNotExist = User.DoesNotExist
-        mock.objects.get.side_effect = User.DoesNotExist
-        result = render(dummy_project, "**@notvaliduser**")
-        assert result == '<p><strong>@notvaliduser</strong></p>'
-
-
 def test_proccessor_valid_us_reference():
     with patch("taiga.mdrender.extensions.references.get_instance_by_ref") as mock:
         instance = mock.return_value
@@ -193,11 +174,3 @@ def test_render_and_extract_references():
         instance.content_object.subject = "test"
         (_, extracted) = render_and_extract(dummy_project, "**#1**")
         assert extracted['references'] == [instance.content_object]
-
-
-def test_render_and_extract_mentions():
-    with patch("taiga.mdrender.extensions.mentions.User") as mock:
-        instance = mock.objects.get.return_value
-        instance.get_full_name.return_value = "test name"
-        (_, extracted) = render_and_extract(dummy_project, "**@user1**")
-        assert extracted['mentions'] == [instance]