diff --git a/opentech/apply/funds/tests/factories/__init__.py b/opentech/apply/funds/tests/factories/__init__.py
index 015c78859602eb6451d47cb2a6956ef9e9527467..c9d2b8ebadf12898359444c6059e84c4383a94cc 100644
--- a/opentech/apply/funds/tests/factories/__init__.py
+++ b/opentech/apply/funds/tests/factories/__init__.py
@@ -1,2 +1,9 @@
-from .models import *  # noqa
+from . import models
+from .models import * # noqa
+from . import blocks
 from .blocks import *  # noqa
+
+__all__ = []
+
+__all__.extend(blocks.__all__)
+__all__.extend(models.__all__)
diff --git a/opentech/apply/funds/tests/factories/blocks.py b/opentech/apply/funds/tests/factories/blocks.py
index 86f862062c758758c3e4ce17ce8bed8ae0200144..de04acc9acf1ea0a87f318f0481023bf121c5049 100644
--- a/opentech/apply/funds/tests/factories/blocks.py
+++ b/opentech/apply/funds/tests/factories/blocks.py
@@ -4,6 +4,9 @@ from opentech.apply.stream_forms.blocks import FormFieldBlock
 from opentech.apply.funds import blocks
 
 
+__all__ = ['FormFieldBlock', 'FullNameBlockFactory', 'EmailBlockFactory']
+
+
 class FormFieldBlockFactory(wagtail_factories.StructBlockFactory):
     class Meta:
         model = FormFieldBlock
diff --git a/opentech/apply/funds/tests/factories/models.py b/opentech/apply/funds/tests/factories/models.py
index 9d24c17865568d032ff076f1a5f43ba7c4592753..3850da9b1bffa3dffa3af600011bbc51788c6492 100644
--- a/opentech/apply/funds/tests/factories/models.py
+++ b/opentech/apply/funds/tests/factories/models.py
@@ -17,6 +17,20 @@ from opentech.apply.funds.workflow import Action, Phase, Stage, Workflow
 from . import blocks
 
 
+__all__ = [
+    'ActionFactory',
+    'PhaseFactory',
+    'StageFactory',
+    'WorkflowFactory',
+    'FundTypeFactory',
+    'FundFormFactory',
+    'ApplicationFormFactory',
+    'RoundFactory',
+    'LabFactory',
+    'LabFormFactory',
+]
+
+
 class ListSubFactory(factory.SubFactory):
     def __init__(self, *args, count=0, **kwargs):
         self.count = count
diff --git a/opentech/apply/funds/tests/test_models.py b/opentech/apply/funds/tests/test_models.py
index fe2c921fe16c5378ad9c113d57b77dab766d9df3..7d25e7f5eb7a9cbfb05705c142a774585a3ed06d 100644
--- a/opentech/apply/funds/tests/test_models.py
+++ b/opentech/apply/funds/tests/test_models.py
@@ -200,7 +200,7 @@ class TestFormSubmission(TestCase):
         self.assertEqual(ApplicationSubmission.objects.first().user, user)
 
     def test_associated_if_logged_in(self):
-        user = self.User.objects.get_or_create(email=self.email, defaults={'full_name': self.name})
+        user, _ = self.User.objects.get_or_create(email=self.email, defaults={'full_name': self.name})
 
         self.assertEqual(self.User.objects.count(), 1)
 
@@ -213,7 +213,7 @@ class TestFormSubmission(TestCase):
 
     # This will need to be updated when we hide user information contextually
     def test_errors_if_blank_user_data_even_if_logged_in(self):
-        user = self.User.objects.get_or_create(email=self.email, defaults={'full_name': self.name})
+        user, _ = self.User.objects.get_or_create(email=self.email, defaults={'full_name': self.name})
 
         self.assertEqual(self.User.objects.count(), 1)