diff --git a/mayan/apps/document_indexing/test_models.py b/mayan/apps/document_indexing/test_models.py
index ee8f26851a..0c040155a4 100644
--- a/mayan/apps/document_indexing/test_models.py
+++ b/mayan/apps/document_indexing/test_models.py
@@ -4,7 +4,7 @@ from django.core.files.base import File
 from django.test import TestCase
 
 from documents.models import Document, DocumentType
-from documents.tests import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE
+from documents.test_models import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE
 from metadata.models import MetadataType, DocumentTypeMetadataType
 
 from .models import Index, IndexInstanceNode, IndexTemplateNode
diff --git a/mayan/apps/dynamic_search/test_models.py b/mayan/apps/dynamic_search/test_models.py
index b8014a2b0f..149476a4b0 100644
--- a/mayan/apps/dynamic_search/test_models.py
+++ b/mayan/apps/dynamic_search/test_models.py
@@ -8,7 +8,7 @@ from django.test import TestCase
 
 from documents.models import Document, DocumentType
 from documents.search import document_search
-from documents.tests import (
+from documents.test_models import (
     TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL,
     TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH
 )
diff --git a/mayan/apps/dynamic_search/test_views.py b/mayan/apps/dynamic_search/test_views.py
index 0ecc14d32c..1aea9a5818 100644
--- a/mayan/apps/dynamic_search/test_views.py
+++ b/mayan/apps/dynamic_search/test_views.py
@@ -8,7 +8,7 @@ from django.test import TestCase
 
 from documents.models import Document, DocumentType
 from documents.search import document_search
-from documents.tests import (
+from documents.test_models import (
     TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL,
     TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH
 )
diff --git a/mayan/apps/folders/test_models.py b/mayan/apps/folders/test_models.py
index 3bf4d45a01..320315a9e7 100644
--- a/mayan/apps/folders/test_models.py
+++ b/mayan/apps/folders/test_models.py
@@ -7,7 +7,7 @@ from django.contrib.auth.models import User
 from django.core.files.base import File
 from django.test import TestCase
 
-from authentication.tests import (
+from authentication.test_views import (
     TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME
 )
 from documents.models import Document, DocumentType
diff --git a/mayan/apps/ocr/test_models.py b/mayan/apps/ocr/test_models.py
index adcd720683..d726eca1ae 100644
--- a/mayan/apps/ocr/test_models.py
+++ b/mayan/apps/ocr/test_models.py
@@ -4,7 +4,7 @@ from django.core.files.base import File
 from django.test import TransactionTestCase
 
 from documents.models import Document, DocumentType
-from documents.tests import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE
+from documents.test_models import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE
 
 
 class DocumentOCRTestCase(TransactionTestCase):
diff --git a/mayan/apps/sources/test_models.py b/mayan/apps/sources/test_models.py
index 3d60ca444e..aee6e57f63 100644
--- a/mayan/apps/sources/test_models.py
+++ b/mayan/apps/sources/test_models.py
@@ -12,7 +12,7 @@ from documents.models import Document, DocumentType
 from sources.literals import SOURCE_CHOICE_WEB_FORM
 from sources.models import WebFormSource
 
-from documents.tests import (
+from documents.test_models import (
     TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL,
     TEST_DOCUMENT_PATH, TEST_SMALL_DOCUMENT_PATH,
     TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_TYPE,
diff --git a/mayan/apps/sources/test_views.py b/mayan/apps/sources/test_views.py
index 42a38ae95a..65a065334f 100644
--- a/mayan/apps/sources/test_views.py
+++ b/mayan/apps/sources/test_views.py
@@ -12,7 +12,7 @@ from documents.models import Document, DocumentType
 from sources.literals import SOURCE_CHOICE_WEB_FORM
 from sources.models import WebFormSource
 
-from documents.tests import (
+from documents.test_models import (
     TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL,
     TEST_DOCUMENT_PATH, TEST_SMALL_DOCUMENT_PATH,
     TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_TYPE,
@@ -63,10 +63,6 @@ class UploadDocumentTestCase(TestCase):
         self.failUnlessEqual(self.document.checksum, 'c637ffab6b8bb026ed3784afdb07663fddc60099853fae2be93890852a69ecf3')
         self.failUnlessEqual(self.document.page_count, 47)
 
-        # Delete the document
-        self.client.post(reverse('documents:document_delete', args=[self.document.pk]))
-        self.assertEqual(Document.objects.count(), 0)
-
     def test_issue_25(self):
         # Login the admin user
         logged_in = self.client.login(username=TEST_ADMIN_USERNAME, password=TEST_ADMIN_PASSWORD)