diff --git a/compressor/base.py b/compressor/base.py
index 61bfe63..19c5e6a 100644
--- a/compressor/base.py
+++ b/compressor/base.py
@@ -258,8 +258,8 @@ class Compressor(object):
         if context is None:
             context = {}
         final_context = Context()
-        final_context.update(context)
         final_context.update(self.context)
+        final_context.update(context)
         final_context.update(self.extra_context)
         post_compress.send(sender='django-compressor', type=self.type, mode=mode, context=final_context) 
         return render_to_string("compressor/%s_%s.html" %
diff --git a/tests/tests/base.py b/tests/tests/base.py
index 4dc5608..1b902f6 100644
--- a/tests/tests/base.py
+++ b/tests/tests/base.py
@@ -96,6 +96,16 @@ class CompressorTestCase(TestCase):
         out = u'<script type="text/javascript" src="/media/CACHE/js/066cd253eada.js"></script>'
         self.assertEqual(out, self.js_node.output())
 
+    def test_js_override_url(self):
+        self.js_node.context.update({'url': u'This is not a url, just a text'})
+        out = u'<script type="text/javascript" src="/media/CACHE/js/066cd253eada.js"></script>'
+        self.assertEqual(out, self.js_node.output())
+
+    def test_css_override_url(self):
+        self.css_node.context.update({'url': u'This is not a url, just a text'})
+        output = css_tag('/media/CACHE/css/e41ba2cc6982.css')
+        self.assertEqual(output, self.css_node.output().strip())
+
     def test_js_return_if_off(self):
         try:
             enabled = settings.COMPRESS_ENABLED