diff --git a/mayan/apps/sources/tests.py b/mayan/apps/sources/tests.py
new file mode 100644
index 0000000000..1ca9ca8dc0
--- /dev/null
+++ b/mayan/apps/sources/tests.py
@@ -0,0 +1,89 @@
+from json import loads
+
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.core.files.base import File
+from django.core.urlresolvers import reverse
+from django.test.client import Client
+from django.test import TestCase
+
+from documents.literals import VERSION_UPDATE_MAJOR
+from documents.models import Document, DocumentType
+from sources.literals import SOURCE_CHOICE_WEB_FORM
+from sources.models import WebFormSource
+
+from documents.tests import (TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME,
+                             TEST_ADMIN_EMAIL, TEST_SMALL_DOCUMENT_FILENAME,
+                             TEST_DOCUMENT_PATH, TEST_SIGNED_DOCUMENT_PATH,
+                             TEST_SMALL_DOCUMENT_PATH,
+                             TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_TYPE)
+
+
+class UploadDocumentTestCase(TestCase):
+    """
+    Test creating documents
+    """
+
+    def setUp(self):
+        self.document_type = DocumentType.objects.create(name='test doc type')
+        self.admin_user = User.objects.create_superuser(username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, password=TEST_ADMIN_PASSWORD)
+        self.client = Client()
+
+    def test_upload_a_document(self):
+        # Login the admin user
+        logged_in = self.client.login(username=TEST_ADMIN_USERNAME, password=TEST_ADMIN_PASSWORD)
+        self.assertTrue(logged_in)
+        self.assertTrue(self.admin_user.is_authenticated())
+
+        # Create new webform source
+        self.client.post(reverse('sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True})
+        self.assertEqual(WebFormSource.objects.count(), 1)
+
+        # Upload the test document
+        with open(TEST_DOCUMENT_PATH) as file_descriptor:
+            self.client.post(reverse('sources:upload_interactive'), {'document-language': 'eng', 'source-file': file_descriptor, 'document_type_id': self.document_type.pk})
+        self.assertEqual(Document.objects.count(), 1)
+
+        self.document = Document.objects.all().first()
+        self.failUnlessEqual(self.document.exists(), True)
+        self.failUnlessEqual(self.document.size, 272213)
+
+        self.failUnlessEqual(self.document.file_mimetype, 'application/pdf')
+        self.failUnlessEqual(self.document.file_mime_encoding, 'binary')
+        self.failUnlessEqual(self.document.label, 'mayan_11_1.pdf')
+        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)
+        self.assertTrue(logged_in)
+        self.assertTrue(self.admin_user.is_authenticated())
+
+        # Create new webform source
+        self.client.post(reverse('sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True})
+        self.assertEqual(WebFormSource.objects.count(), 1)
+
+        # Upload the test document
+        with open(TEST_SMALL_DOCUMENT_PATH) as file_descriptor:
+            self.client.post(reverse('sources:upload_interactive'), {'document-language': 'eng', 'source-file': file_descriptor, 'document-description': TEST_DOCUMENT_DESCRIPTION, 'document_type_id': self.document_type.pk})
+        self.assertEqual(Document.objects.count(), 1)
+
+        document = Document.objects.first()
+        # Test for issue 25 during creation
+        self.failUnlessEqual(document.description, TEST_DOCUMENT_DESCRIPTION)
+
+        # Reset description
+        document.description = ''
+        document.save()
+        self.failUnlessEqual(document.description, '')
+
+        # Test for issue 25 during editing
+        self.client.post(reverse('documents:document_edit', args=[document.pk]), {'description': TEST_DOCUMENT_DESCRIPTION, 'language': document.language, 'label': document.label})
+        # Fetch document again and test description
+        document = Document.objects.first()
+        self.failUnlessEqual(document.description, TEST_DOCUMENT_DESCRIPTION)