diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py
index 3c1febd..84d6e20 100644
--- a/django/contrib/admin/helpers.py
+++ b/django/contrib/admin/helpers.py
@@ -75,7 +75,8 @@ class Fieldset(object):
 
     def _media(self):
         if 'collapse' in self.classes:
-            return forms.Media(js=['%sjs/collapse.min.js' % settings.ADMIN_MEDIA_PREFIX])
+            js = ['js/jquery.min.js', 'js/collapse.min.js']
+            return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js])
         return forms.Media()
     media = property(_media)
 
diff --git a/django/contrib/admin/templates/admin/edit_inline/stacked.html b/django/contrib/admin/templates/admin/edit_inline/stacked.html
index fb112a0..2c7e878 100644
--- a/django/contrib/admin/templates/admin/edit_inline/stacked.html
+++ b/django/contrib/admin/templates/admin/edit_inline/stacked.html
@@ -63,5 +63,5 @@
             })
         });
     });
-})(jQuery.noConflict());
+})(jQuery.noConflict(true));
 </script>
diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html
index dc9552f..ecbed7c 100644
--- a/django/contrib/admin/templates/admin/edit_inline/tabular.html
+++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html
@@ -109,5 +109,5 @@
             })
         });
     });
-})(jQuery.noConflict());
+})(jQuery.noConflict(true));
 </script>