Merge branch 'master' into 3.0-beta

2 files changed, 4 insertions, 3 deletions

diff --git a/tests/test_fields.py b/tests/test_fields.py
index 5db381ac..13525632 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -793,7 +793,8 @@ class TestChoiceField(FieldValues):
         'amazing': ['`amazing` is not a valid choice.']
     }
     outputs = {
-        'good': 'good'
+        'good': 'good',
+        '': ''
     }
     field = serializers.ChoiceField(
         choices=[
diff --git a/tests/test_validators.py b/tests/test_validators.py
index 86614b10..1df0641c 100644
--- a/tests/test_validators.py
+++ b/tests/test_validators.py
@@ -88,8 +88,8 @@ class TestUniquenessTogetherValidation(TestCase):
         expected = dedent("""
             UniquenessTogetherSerializer():
                 id = IntegerField(label='ID', read_only=True)
-                race_name = CharField(max_length=100)
-                position = IntegerField()
+                race_name = CharField(max_length=100, required=True)
+                position = IntegerField(required=True)
                 class Meta:
                     validators = [<UniqueTogetherValidator(queryset=UniquenessTogetherModel.objects.all(), fields=('race_name', 'position'))>]
         """)