diff --git a/.travis.yml b/.travis.yml
index ef917d4..17bad15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,22 @@
 language: ruby
 script : script/cibuild
+sudo: false
+cache: bundler
 rvm:
+- 2.2
 - 2.1
 - 2.0
-- 1.9.3
 notifications:
   email: false
+branches:
+  only:
+  - master
+
+matrix:
+  include:
+    -
+      rvm: 1.9
+      env: JEKYLL_VERSION=2.0
+env:
+  - JEKYLL_VERSION=3.0
+  - JEKYLL_VERSION=2.0
diff --git a/jekyll-opal.gemspec b/jekyll-opal.gemspec
index 193225b..ca8e9bd 100644
--- a/jekyll-opal.gemspec
+++ b/jekyll-opal.gemspec
@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "opal", "~> 0.6.0"
+  spec.add_runtime_dependency "opal", "~> 0.8.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "jekyll", "~> 2.0"
+  spec.add_development_dependency "jekyll", ENV["JEKYLL_VERSION"] ? "~> #{ENV["JEKYLL_VERSION"]}" : ">= 2.0"
 end
diff --git a/spec/opal_converter_spec.rb b/spec/opal_converter_spec.rb
index 0e8f9c0..23a409b 100644
--- a/spec/opal_converter_spec.rb
+++ b/spec/opal_converter_spec.rb
@@ -5,11 +5,12 @@
   let(:simple_opal) { "puts 'ohai jekyll'" }
   let(:simple_js_output) do
     <<-JS
-/* Generated by Opal 0.6.2 */
-(function($opal) {
-  var self = $opal.top, $scope = $opal, nil = $opal.nil, $breaker = $opal.breaker, $slice = $opal.slice;
+/* Generated by Opal 0.8.1 */
+(function(Opal) {
+  Opal.dynamic_require_severity = "error";
+  var self = Opal.top, $scope = Opal, nil = Opal.nil, $breaker = Opal.breaker, $slice = Opal.slice;
 
-  $opal.add_stubs(['$puts']);
+  Opal.add_stubs(['$puts']);
   return self.$puts("ohai jekyll")
 })(Opal);
 JS
@@ -28,7 +29,7 @@
   end
 
   it "explodes on bad input" do
-    expect(->{ subject.convert(bogus_opal) }).to raise_error
+    expect(->{ subject.convert(bogus_opal) }).to raise_error(RuntimeError)
   end
 
 end
diff --git a/spec/opal_generator_spec.rb b/spec/opal_generator_spec.rb
index f00c767..46fc878 100644
--- a/spec/opal_generator_spec.rb
+++ b/spec/opal_generator_spec.rb
@@ -10,7 +10,7 @@
   end
 
   it "can build the opal stdlib" do
-    expect(subject.opal_stdlib).to match("(Opal);")
+    expect(subject.opal_stdlib.to_s).to match("(Opal);")
   end
 
   context "when ensuring directory is there" do