diff --git a/mayan/apps/documents/tests.py b/mayan/apps/documents/tests.py
index 23041d7240..ed33a7f91d 100644
--- a/mayan/apps/documents/tests.py
+++ b/mayan/apps/documents/tests.py
@@ -61,7 +61,7 @@ class DocumentTestCase(TestCase):
                 'version_update': VERSION_UPDATE_MAJOR,
             }
 
-            new_version = self.document.new_version(file=File(file_object, name='mayan_11_1.pdf.gpg'), **new_version_data)
+            new_version = self.document.new_version(file_object=File(file_object, name='mayan_11_1.pdf.gpg'), **new_version_data)
 
         self.failUnlessEqual(self.document.latest_version.get_formated_version(), '2.0')
 
@@ -70,7 +70,7 @@ class DocumentTestCase(TestCase):
             'version_update': VERSION_UPDATE_MAJOR,
         }
         with open(TEST_DOCUMENT_PATH) as file_object:
-            new_version = self.document.new_version(file=File(file_object), **new_version_data)
+            new_version = self.document.new_version(file_object=File(file_object), **new_version_data)
 
         self.failUnlessEqual(self.document.latest_version.get_formated_version(), '3.0')
 
@@ -93,7 +93,7 @@ class DocumentSearchTestCase(TestCase):
         self.document.save()
 
         with open(TEST_DOCUMENT_PATH) as file_object:
-            new_version = self.document.new_version(file=File(file_object, name='mayan_11_1.pdf'))
+            new_version = self.document.new_version(file_object=File(file_object, name='mayan_11_1.pdf'))
 
         # Text extraction on the first page only
         parse_document_page(self.document.latest_version.pages.all()[0])
diff --git a/mayan/apps/folders/tests.py b/mayan/apps/folders/tests.py
index 9840f50ad8..8ea854a3d7 100644
--- a/mayan/apps/folders/tests.py
+++ b/mayan/apps/folders/tests.py
@@ -26,7 +26,7 @@ class FolderTestCase(TestCase):
         self.document.save()
 
         with open(TEST_DOCUMENT_PATH) as file_object:
-            self.document.new_version(file=File(file_object, name='mayan_11_1.pdf'))
+            self.document.new_version(file_object=File(file_object, name='mayan_11_1.pdf'))
 
     def test_creation_of_folder(self):
         user = User.objects.all()[0]
@@ -39,24 +39,24 @@ class FolderTestCase(TestCase):
     def test_addition_of_documents(self):
         user = User.objects.all()[0]
         folder = Folder.objects.create(title='test', user=user)
-        folder.add_document(self.document)
+        folder.documents.add(self.document)
 
         self.assertEqual(folder.documents.count(), 1)
-        self.assertEqual(list(folder.documents), [self.document])
+        self.assertEqual(list(folder.documents.all()), [self.document])
         folder.delete()
 
     def test_addition_and_deletion_of_documents(self):
         user = User.objects.all()[0]
         folder = Folder.objects.create(title='test', user=user)
-        folder.add_document(self.document)
+        folder.documents.add(self.document)
 
         self.assertEqual(folder.documents.count(), 1)
-        self.assertEqual(list(folder.documents), [self.document])
+        self.assertEqual(list(folder.documents.all()), [self.document])
 
         folder.remove_document(self.document)
 
         self.assertEqual(folder.documents.count(), 0)
-        self.assertEqual(list(folder.documents), [])
+        self.assertEqual(list(folder.documents.all()), [])
 
         folder.delete()
 
diff --git a/mayan/apps/ocr/tests.py b/mayan/apps/ocr/tests.py
index 913b3cf9d3..969a76b685 100644
--- a/mayan/apps/ocr/tests.py
+++ b/mayan/apps/ocr/tests.py
@@ -26,7 +26,7 @@ class DocumentSearchTestCase(TestCase):
         self.document.save()
 
         with open(TEST_DOCUMENT_PATH) as file_object:
-            self.document.new_version(file=File(file_object, name='title_page.png'))
+            self.document.new_version(file_object=File(file_object, name='title_page.png'))
 
         # Clear OCR queue
         QueueDocument.objects.all().delete()