diff --git a/compressor/tests/test_jinja2ext.py b/compressor/tests/test_jinja2ext.py
index c77580f..5adc8ee 100644
--- a/compressor/tests/test_jinja2ext.py
+++ b/compressor/tests/test_jinja2ext.py
@@ -40,6 +40,10 @@ class TestJinja2CompressorExtension(TestCase):
         self.assertRaises(self.jinja2.exceptions.TemplateSyntaxError,
             self.env.from_string, '{% compress foo %}Foobar{% endcompress %}')
 
+    def test_error_raised_if_wrong_closing_kind_given(self):
+        self.assertRaises(self.jinja2.exceptions.TemplateSyntaxError,
+            self.env.from_string, '{% compress js %}Foobar{% endcompress css %}')
+
     def test_error_raised_if_wrong_mode_given(self):
         self.assertRaises(self.jinja2.exceptions.TemplateSyntaxError,
             self.env.from_string, '{% compress css foo %}Foobar{% endcompress %}')
@@ -55,12 +59,23 @@ class TestJinja2CompressorExtension(TestCase):
         template = self.env.from_string(template_string)
         self.assertEqual(tag_body, template.render())
 
+        # Test with explicit kind
+        template_string = '{% compress css %}' + tag_body + '{% endcompress css %}'
+        template = self.env.from_string(template_string)
+        self.assertEqual(tag_body, template.render())
+
     def test_empty_tag(self):
         template = self.env.from_string("""{% compress js %}{% block js %}
         {% endblock %}{% endcompress %}""")
         context = {'STATIC_URL': settings.COMPRESS_URL}
         self.assertEqual('', template.render(context))
 
+    def test_empty_tag_with_kind(self):
+        template = self.env.from_string("""{% compress js %}{% block js %}
+        {% endblock %}{% endcompress js %}""")
+        context = {'STATIC_URL': settings.COMPRESS_URL}
+        self.assertEqual('', template.render(context))
+
     def test_css_tag(self):
         template = self.env.from_string("""{% compress css -%}
         <link rel="stylesheet" href="{{ STATIC_URL }}css/one.css" type="text/css" charset="utf-8">