diff --git a/History.markdown b/History.markdown
index aef437dc..1e6423c6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
 ### Development Fixes
   * Add a link to the site in the README.md file (#1795)
   * Add in History and site changes from `v1-stable` branch (#1836)
+  * Fix the `highlight` tag feature
 
 ### Site Enhancements
   * Document Kramdown's GFM parser option (#1791)
diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index 0a08f753..50d0fff1 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -91,11 +91,12 @@ Feature: Site configuration
     And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Highlight code with pygments
-    Given I have an "index.html" file that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}"
-    And I have a configuration file with "pygments" set to "true"
+    Given I have an "index.html" page that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}"
+    And I have a configuration file with "highlighter" set to "pygments"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "puts 'Hello world!'" in "_site/index.html"
+    And I should see "Hello world!" in "_site/index.html"
+    And I should see "class=\"highlight\"" in "_site/index.html"
 
   Scenario: Set time and no future dated posts
     Given I have a _layouts directory