diff --git a/lib/capybara/spec/driver.rb b/lib/capybara/spec/driver.rb
index 724e9c74..df0baa6f 100644
--- a/lib/capybara/spec/driver.rb
+++ b/lib/capybara/spec/driver.rb
@@ -26,6 +26,20 @@ shared_examples_for 'driver' do
       @driver.visit('/with_simple_html')
       @driver.body.should include('Bar')
     end
+
+    if "".respond_to?(:encoding)
+      context "encoding of response between ascii and utf8" do
+        it "should be valid with html entities" do
+          @driver.visit('/with_html_entities')
+          lambda { @driver.body.encode!("UTF-8") }.should_not raise_error
+        end
+
+        it "should be valid without html entities" do
+          @driver.visit('/with_html')
+          lambda { @driver.body.encode!("UTF-8") }.should_not raise_error
+        end
+      end
+    end
   end
 
   describe '#find' do
diff --git a/lib/capybara/spec/views/with_html_entities.erb b/lib/capybara/spec/views/with_html_entities.erb
new file mode 100644
index 00000000..b7b0e33c
--- /dev/null
+++ b/lib/capybara/spec/views/with_html_entities.erb
@@ -0,0 +1 @@
+Encoding with — html entities »