diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index caea9cd924e..b8b8e4492ff 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -183,5 +183,20 @@ def trigger_hooks(hook_name, *args)
     def write?
       true
     end
+
+    # The Page excerpt_separator, from the YAML Front-Matter or site
+    # default excerpt_separator value
+    #
+    # Returns the document excerpt_separator
+    def excerpt_separator
+      (data["excerpt_separator"] || site.config["excerpt_separator"]).to_s
+    end
+
+    # Whether to generate an excerpt
+    #
+    # Returns true if the excerpt separator is configured.
+    def generate_excerpt?
+      !excerpt_separator.empty?
+    end
   end
 end
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index 03eb4a4d34b..97cc4524549 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -315,7 +315,7 @@ def do_render(document)
 
 
     should "produce a proper excerpt" do
-      assert_includes @excerpt.content, "I am the excerpt"
+      assert_equal @excerpt.content, "I am the excerpt\n\n"
     end
   end
 end