diff --git a/features/bibtex.feature b/features/bibtex.feature
index 7d0f542a4907ab2d4411b808ab1306e3cb0cc83b..1ec7c578a452e224c610b9e6a1d3bb486afe52b2 100644
--- a/features/bibtex.feature
+++ b/features/bibtex.feature
@@ -187,6 +187,36 @@ Feature: BibTeX
     And the "_site/scholar.html" file should exist
     And I should see "<abbr>1 book \[ruby\]</abbr>Matsumoto" in "_site/scholar.html"
 
+  @tags @bibliography @config @template @names
+  Scenario: Simple Bibliography With Custom Template and Name Parsing
+    Given I have a scholar configuration with:
+      | key                   | value                         |
+      | source                | ./_bibliography               |
+      | bibliography_template | <span>{{entry.author}}</span> |
+    And I have the following BibTeX options:
+      | key                   | value  |
+      | parse_names           | false  |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{ruby,
+        title     = {The Ruby Programming Language},
+        author    = {David Flanagan and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% bibliography -f references %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    And I should see "David Flanagan and Matsumoto, Yukihiro" in "_site/scholar.html"
+
   @tags @filter
   Scenario: Filtered Bibliography Loaded From Default Directory
     Given I have a scholar configuration with: