diff --git a/mayan/apps/motd/tests/mixins.py b/mayan/apps/motd/tests/mixins.py
new file mode 100644
index 0000000000..26e9f59e21
--- /dev/null
+++ b/mayan/apps/motd/tests/mixins.py
@@ -0,0 +1,12 @@
+from __future__ import unicode_literals
+
+from ..models import Message
+
+from .literals import TEST_LABEL, TEST_MESSAGE
+
+
+class MOTDTestMixin(object):
+    def _create_test_message(self):
+        self.test_message = Message.objects.create(
+            label=TEST_LABEL, message=TEST_MESSAGE
+        )
diff --git a/mayan/apps/motd/tests/test_api.py b/mayan/apps/motd/tests/test_api.py
index 07891f2365..d9619ae416 100644
--- a/mayan/apps/motd/tests/test_api.py
+++ b/mayan/apps/motd/tests/test_api.py
@@ -13,14 +13,10 @@ from ..permissions import (
 from .literals import (
     TEST_LABEL, TEST_LABEL_EDITED, TEST_MESSAGE, TEST_MESSAGE_EDITED
 )
+from .mixins import MOTDTestMixin
 
 
-class MOTDAPITestCase(BaseAPITestCase):
-    def _create_message(self):
-        return Message.objects.create(
-            label=TEST_LABEL, message=TEST_MESSAGE
-        )
-
+class MOTDAPITestCase(MOTDTestMixin, BaseAPITestCase):
     def _request_message_create_view(self):
         return self.post(
             viewname='rest_api:message-list', data={
@@ -31,10 +27,12 @@ class MOTDAPITestCase(BaseAPITestCase):
     def test_message_create_view_no_permission(self):
         response = self._request_message_create_view()
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
         self.assertEqual(Message.objects.count(), 0)
 
     def test_message_create_view_with_permission(self):
         self.grant_permission(permission=permission_message_create)
+
         response = self._request_message_create_view()
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
@@ -49,35 +47,49 @@ class MOTDAPITestCase(BaseAPITestCase):
 
     def _request_message_delete_view(self):
         return self.delete(
-            viewname='rest_api:message-detail', args=(self.message.pk,)
+            viewname='rest_api:message-detail', kwargs={
+                'pk': self.test_message.pk
+            }
         )
 
     def test_message_delete_view_no_access(self):
-        self.message = self._create_message()
+        self._create_test_message()
+
         response = self._request_message_delete_view()
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
         self.assertEqual(Message.objects.count(), 1)
 
     def test_message_delete_view_with_access(self):
-        self.message = self._create_message()
-        self.grant_access(permission=permission_message_delete, obj=self.message)
+        self._create_test_message()
+        self.grant_access(
+            obj=self.test_message, permission=permission_message_delete
+        )
+
         response = self._request_message_delete_view()
         self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+
         self.assertEqual(Message.objects.count(), 0)
 
     def _request_message_detail_view(self):
         return self.get(
-            viewname='rest_api:message-detail', args=(self.message.pk,)
+            viewname='rest_api:message-detail', kwargs={
+                'pk': self.test_message.pk
+            }
         )
 
     def test_message_detail_view_no_access(self):
-        self.message = self._create_message()
+        self._create_test_message()
+
         response = self._request_message_detail_view()
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_message_detail_view_with_access(self):
-        self.message = self._create_message()
-        self.grant_access(permission=permission_message_view, obj=self.message)
+        self._create_test_message()
+        self.grant_access(
+            obj=self.test_message, permission=permission_message_view
+        )
+
         response = self._request_message_detail_view()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
@@ -85,58 +97,68 @@ class MOTDAPITestCase(BaseAPITestCase):
 
     def _request_message_edit_via_patch_view(self):
         return self.patch(
-            viewname='rest_api:message-detail', args=(self.message.pk,),
-            data={
+            viewname='rest_api:message-detail', kwargs={
+                'pk': self.test_message.pk
+            }, data={
                 'label': TEST_LABEL_EDITED,
                 'message': TEST_MESSAGE_EDITED
             }
         )
 
     def test_message_edit_via_patch_view_no_access(self):
-        self.message = self._create_message()
+        self._create_test_message()
+
         response = self._request_message_edit_via_patch_view()
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
-        self.message.refresh_from_db()
+        self.test_message.refresh_from_db()
 
-        self.assertEqual(self.message.label, TEST_LABEL)
-        self.assertEqual(self.message.message, TEST_MESSAGE)
+        self.assertEqual(self.test_message.label, TEST_LABEL)
+        self.assertEqual(self.test_message.message, TEST_MESSAGE)
 
     def test_message_edit_via_patch_view_with_access(self):
-        self.message = self._create_message()
-        self.grant_access(permission=permission_message_edit, obj=self.message)
+        self._create_test_message()
+        self.grant_access(
+            obj=self.test_message, permission=permission_message_edit
+        )
+
         response = self._request_message_edit_via_patch_view()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-        self.message.refresh_from_db()
-        self.assertEqual(self.message.label, TEST_LABEL_EDITED)
-        self.assertEqual(self.message.message, TEST_MESSAGE_EDITED)
+        self.test_message.refresh_from_db()
+        self.assertEqual(self.test_message.label, TEST_LABEL_EDITED)
+        self.assertEqual(self.test_message.message, TEST_MESSAGE_EDITED)
 
     def _request_message_edit_via_put_view(self):
         return self.put(
-            viewname='rest_api:message-detail', args=(self.message.pk,),
-            data={
+            viewname='rest_api:message-detail', kwargs={
+                'pk': self.test_message.pk
+            }, data={
                 'label': TEST_LABEL_EDITED,
                 'message': TEST_MESSAGE_EDITED
             }
         )
 
     def test_message_edit_via_put_view_no_access(self):
-        self.message = self._create_message()
+        self._create_test_message()
+
         response = self._request_message_edit_via_put_view()
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
-        self.message.refresh_from_db()
+        self.test_message.refresh_from_db()
 
-        self.assertEqual(self.message.label, TEST_LABEL)
-        self.assertEqual(self.message.message, TEST_MESSAGE)
+        self.assertEqual(self.test_message.label, TEST_LABEL)
+        self.assertEqual(self.test_message.message, TEST_MESSAGE)
 
     def test_message_edit_via_put_view_with_access(self):
-        self.message = self._create_message()
-        self.grant_access(permission=permission_message_edit, obj=self.message)
+        self._create_test_message()
+        self.grant_access(
+            obj=self.test_message, permission=permission_message_edit
+        )
+
         response = self._request_message_edit_via_put_view()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-        self.message.refresh_from_db()
-        self.assertEqual(self.message.label, TEST_LABEL_EDITED)
-        self.assertEqual(self.message.message, TEST_MESSAGE_EDITED)
+        self.test_message.refresh_from_db()
+        self.assertEqual(self.test_message.label, TEST_LABEL_EDITED)
+        self.assertEqual(self.test_message.message, TEST_MESSAGE_EDITED)
diff --git a/mayan/apps/motd/tests/test_models.py b/mayan/apps/motd/tests/test_models.py
index 457cacedac..574e1e7a08 100644
--- a/mayan/apps/motd/tests/test_models.py
+++ b/mayan/apps/motd/tests/test_models.py
@@ -7,14 +7,13 @@ from django.utils import timezone
 
 from ..models import Message
 
-from .literals import TEST_LABEL, TEST_MESSAGE
+from .mixins import MOTDTestMixin
 
 
-class MOTDTestCase(TestCase):
+class MOTDTestCase(MOTDTestMixin, TestCase):
     def setUp(self):
-        self.motd = Message.objects.create(
-            label=TEST_LABEL, message=TEST_MESSAGE
-        )
+        super(MOTDTestCase, self).setUp()
+        self._create_test_message()
 
     def test_basic(self):
         queryset = Message.objects.get_for_now()
@@ -22,25 +21,25 @@ class MOTDTestCase(TestCase):
         self.assertEqual(queryset.exists(), True)
 
     def test_start_datetime(self):
-        self.motd.start_datetime = timezone.now() - timedelta(days=1)
-        self.motd.save()
+        self.test_message.start_datetime = timezone.now() - timedelta(days=1)
+        self.test_message.save()
 
         queryset = Message.objects.get_for_now()
 
-        self.assertEqual(queryset.first(), self.motd)
+        self.assertEqual(queryset.first(), self.test_message)
 
     def test_end_datetime(self):
-        self.motd.start_datetime = timezone.now() - timedelta(days=2)
-        self.motd.end_datetime = timezone.now() - timedelta(days=1)
-        self.motd.save()
+        self.test_message.start_datetime = timezone.now() - timedelta(days=2)
+        self.test_message.end_datetime = timezone.now() - timedelta(days=1)
+        self.test_message.save()
 
         queryset = Message.objects.get_for_now()
 
         self.assertEqual(queryset.exists(), False)
 
     def test_enable(self):
-        self.motd.enabled = False
-        self.motd.save()
+        self.test_message.enabled = False
+        self.test_message.save()
 
         queryset = Message.objects.get_for_now()