diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb
index 61aa68dd..a89908c6 100644
--- a/lib/jekyll/plugin_manager.rb
+++ b/lib/jekyll/plugin_manager.rb
@@ -33,11 +33,12 @@ module Jekyll
     end
 
     def self.require_from_bundler
-      if ENV["JEKYLL_NO_BUNDLER_REQUIRE"]
+      if ENV["JEKYLL_NO_BUNDLER_REQUIRE"] || !File.file?("Gemfile")
         false
       else
         require "bundler"
-        required_gems = Bundler.require(:jekyll_plugins)
+        Bundler.setup # puts all groups on the load path
+        required_gems = Bundler.require(:jekyll_plugins) # requires the gems in this group only
         Jekyll.logger.debug("PluginManager:", "Required #{required_gems.map(&:name).join(', ')}")
         ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = "true"
         true