diff --git a/tests/model_forms/models.py b/tests/model_forms/models.py
index aecbeb18f39..da4f5391c59 100644
--- a/tests/model_forms/models.py
+++ b/tests/model_forms/models.py
@@ -151,7 +151,7 @@ class CustomFF(models.Model):
 
 
 class FilePathModel(models.Model):
-    path = models.FilePathField(path=os.path.dirname(__file__), match=r".*\.py$", blank=True)
+    path = models.FilePathField(path=os.path.dirname(__file__), match='models.py', blank=True)
 
 
 try:
diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py
index 406a137d800..9b991d209d7 100644
--- a/tests/model_forms/tests.py
+++ b/tests/model_forms/tests.py
@@ -2328,18 +2328,14 @@ class FileAndImageFieldTests(TestCase):
             p.image.delete(save=False)
 
     def test_file_path_field_blank(self):
-        """
-        Regression test for #8842: FilePathField(blank=True)
-        """
+        """FilePathField(blank=True) includes the empty option."""
         class FPForm(forms.ModelForm):
             class Meta:
                 model = FilePathModel
                 fields = '__all__'
 
         form = FPForm()
-        names = [p[1] for p in form['path'].field.choices]
-        names.sort()
-        self.assertEqual(names, ['---------', '__init__.py', 'models.py', 'test_uuid.py', 'tests.py'])
+        self.assertEqual([name for _, name in form['path'].field.choices], ['---------', 'models.py'])
 
     @skipUnless(test_images, "Pillow not installed")
     def test_image_field(self):