diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index 7049f50f4..2065e811b 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -309,6 +309,17 @@ class TestEmbedlyFilter(TestCase):
     @patch('urllib2.urlopen')
     @patch('json.loads')
     def test_render_embed_filter(self, loads, urlopen):
+        urlopen.return_value = self.dummy_response
+        loads.return_value = {'type': 'photo',
+                              'url': 'http://www.example.com'}
+        temp = template.Template("{% load embed_filters %}{{ 'http://www.youtube.com/watch/'|embed }}")
+        context = template.Context()
+        result = temp.render(context)
+        self.assertEqual(result, '<img src="http://www.example.com" />')
+
+    @patch('urllib2.urlopen')
+    @patch('json.loads')
+    def test_render_embedly_filter(self, loads, urlopen):
         urlopen.return_value = self.dummy_response
         loads.return_value = {'type': 'photo',
                               'url': 'http://www.example.com'}
@@ -316,3 +327,14 @@ class TestEmbedlyFilter(TestCase):
         context = template.Context()
         result = temp.render(context)
         self.assertEqual(result, '<img src="http://www.example.com" />')
+
+    @patch('urllib2.urlopen')
+    @patch('json.loads')
+    def test_render_embed_filter_nonexistent_type(self, loads, urlopen):
+        urlopen.return_value = self.dummy_response
+        loads.return_value = {'type': 'foo',
+                              'url': 'http://www.example.com'}
+        temp = template.Template("{% load embed_filters %}{{ 'http://www.youtube.com/watch/'|embed }}")
+        context = template.Context()
+        result = temp.render(context)
+        self.assertEqual(result, '')