diff --git a/wagtail/wagtailcore/tests/test_blocks.py b/wagtail/wagtailcore/tests/test_blocks.py
index 429737b500..58e37e5b98 100644
--- a/wagtail/wagtailcore/tests/test_blocks.py
+++ b/wagtail/wagtailcore/tests/test_blocks.py
@@ -110,23 +110,27 @@ class TestFieldBlock(unittest.TestCase):
 class TestRichTextBlock(TestCase):
     fixtures = ['test.json']
 
-    def test_get_default(self):
+    def test_get_default_with_fallback_value(self):
         default_value = blocks.RichTextBlock().get_default()
         self.assertTrue(isinstance(default_value, RichText))
         self.assertEqual(default_value.source, '')
 
+    def test_get_default_with_default_none(self):
         default_value = blocks.RichTextBlock(default=None).get_default()
         self.assertTrue(isinstance(default_value, RichText))
         self.assertEqual(default_value.source, '')
 
+    def test_get_default_with_empty_string(self):
         default_value = blocks.RichTextBlock(default='').get_default()
         self.assertTrue(isinstance(default_value, RichText))
         self.assertEqual(default_value.source, '')
 
+    def test_get_default_with_nonempty_string(self):
         default_value = blocks.RichTextBlock(default='<p>foo</p>').get_default()
         self.assertTrue(isinstance(default_value, RichText))
         self.assertEqual(default_value.source, '<p>foo</p>')
 
+    def test_get_default_with_richtext_value(self):
         default_value = blocks.RichTextBlock(default=RichText('<p>foo</p>')).get_default()
         self.assertTrue(isinstance(default_value, RichText))
         self.assertEqual(default_value.source, '<p>foo</p>')
diff --git a/wagtail/wagtailcore/tests/test_rich_text.py b/wagtail/wagtailcore/tests/test_rich_text.py
index 2afd991c24..b14b635b4f 100644
--- a/wagtail/wagtailcore/tests/test_rich_text.py
+++ b/wagtail/wagtailcore/tests/test_rich_text.py
@@ -121,13 +121,15 @@ class TestExpandDbHtml(TestCase):
 class TestRichTextValue(TestCase):
     fixtures = ['test.json']
 
-    def test_construct(self):
+    def test_construct_with_none(self):
         value = RichText(None)
         self.assertEqual(value.source, '')
 
+    def test_construct_with_empty_string(self):
         value = RichText('')
         self.assertEqual(value.source, '')
 
+    def test_construct_with_nonempty_string(self):
         value = RichText('<p>hello world</p>')
         self.assertEqual(value.source, '<p>hello world</p>')