diff --git a/tests/briar/api/models/test_contacts.py b/tests/briar/api/models/test_contacts.py
index 1ec1a67f83fae15fc72a6f43556f17b1e8f50027..2d1b99142fdb12ea87f1c8d63e24e0b0ffeb0a44 100644
--- a/tests/briar/api/models/test_contacts.py
+++ b/tests/briar/api/models/test_contacts.py
@@ -3,12 +3,8 @@
 # License-Filename: LICENSE.md
 
 import json
-from random import choice
-import requests_mock
-from string import ascii_letters, digits
-from unittest import mock
 
-import pytest
+import requests_mock
 
 from briar.api.models.contacts import Contacts
 
@@ -22,23 +18,3 @@ def test_get_empty(api, request_headers, requests_mock):
                                request_headers=request_headers,
                                text=json.dumps(response))
     assert contacts.get() == response
-
-
-@pytest.fixture
-def api(auth_token):
-    api = mock.Mock()
-    api.auth_token = auth_token
-    return api
-
-
-@pytest.fixture
-def request_headers(auth_token):
-    request_headers = {
-        "Authorization": 'Bearer %s' % auth_token
-        }
-    return request_headers
-
-
-@pytest.fixture
-def auth_token():
-    return ''.join(choice(ascii_letters + digits) for i in range(33))
diff --git a/tests/briar/api/models/test_private_chat.py b/tests/briar/api/models/test_private_chat.py
new file mode 100644
index 0000000000000000000000000000000000000000..46b908a0d273077f7105f4d907d5dd5d5283bcfd
--- /dev/null
+++ b/tests/briar/api/models/test_private_chat.py
@@ -0,0 +1,21 @@
+# Copyright (c) 2019 Nico Alt
+# SPDX-License-Identifier: AGPL-3.0-only
+# License-Filename: LICENSE.md
+
+import json
+
+import requests_mock
+
+from briar.api.models.private_chat import PrivateChat
+
+
+@requests_mock.Mocker(kw='requests_mock')
+def test_get_empty(api, request_headers, requests_mock):
+    private_chat = PrivateChat(api)
+    contact_id = 1
+    url = "http://localhost:7000/v1/messages/%s" % contact_id
+    response = []
+
+    requests_mock.register_uri("GET", url, request_headers=request_headers,
+                               text=json.dumps(response))
+    assert private_chat.get(contact_id) == response
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 0000000000000000000000000000000000000000..7d483abab486dc70bec807dc24b70931a7414f50
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,31 @@
+# Copyright (c) 2019 Nico Alt
+# SPDX-License-Identifier: AGPL-3.0-only
+# License-Filename: LICENSE.md
+
+from random import choice
+from string import ascii_letters, digits
+from unittest import mock
+
+import pytest
+
+# pylint: disable=redefined-outer-name
+
+
+@pytest.fixture
+def api(auth_token):
+    api = mock.Mock()
+    api.auth_token = auth_token
+    return api
+
+
+@pytest.fixture
+def auth_token():
+    return ''.join(choice(ascii_letters + digits) for i in range(33))
+
+
+@pytest.fixture
+def request_headers(auth_token):
+    request_headers = {
+        "Authorization": 'Bearer %s' % auth_token
+        }
+    return request_headers