diff --git a/.travis.yml b/.travis.yml
index 67260650..a59b1054 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 language: ruby
+before_install:
+  - gem install bundler
 rvm:
+  - 2.0.0
   - 1.9.3
   - 1.9.2
   - 1.8.7
diff --git a/test/test_convertible.rb b/test/test_convertible.rb
index 3940f030..ee7fc8e3 100644
--- a/test/test_convertible.rb
+++ b/test/test_convertible.rb
@@ -25,7 +25,7 @@ class TestConvertible < Test::Unit::TestCase
         ret = @convertible.read_yaml(@base, name)
         assert_equal({}, ret)
       end
-      assert_match(/YAML Exception|syntax error/, out)
+      assert_match(/YAML Exception|syntax error|Error reading file/, out)
       assert_match(/#{File.join(@base, name)}/, out)
     end
 
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index 981cdaf3..eed8b97f 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'helper'
 
 class TestKramdown < Test::Unit::TestCase
@@ -23,11 +25,11 @@ class TestKramdown < Test::Unit::TestCase
 
     should "convert quotes to smart quotes" do
       markdown = Converters::Markdown.new(@config)
-      assert_equal "<p>&#8220;Pit&#8217;hy&#8221;</p>", markdown.convert(%{"Pit'hy"}).strip
+      assert_match /<p>(&#8220;|“)Pit(&#8217;|’)hy(&#8221;|”)<\/p>/, markdown.convert(%{"Pit'hy"}).strip
 
       override = { 'kramdown' => { 'smart_quotes' => 'lsaquo,rsaquo,laquo,raquo' } }
       markdown = Converters::Markdown.new(@config.deep_merge(override))
-      assert_equal "<p>&#171;Pit&#8250;hy&#187;</p>", markdown.convert(%{"Pit'hy"}).strip
+      assert_match /<p>(&#171;|«)Pit(&#8250;|›)hy(&#187;|»)<\/p>/, markdown.convert(%{"Pit'hy"}).strip
     end
   end
 end