diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 16c023f..2598bf9 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,10 +1,14 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-06-04 22:53:26 -0400 using RuboCop version 0.31.0.
+# on 2015-06-08 18:16:16 +0000 using RuboCop version 0.32.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 5
+Lint/NestedMethodDefinition:
+  Enabled: false
+
 # Offense count: 53
 Metrics/AbcSize:
   Max: 58
@@ -18,7 +22,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 15
 
-# Offense count: 552
+# Offense count: 553
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 294
diff --git a/.travis.yml b/.travis.yml
index 2e3f4fb..e8d35c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ matrix:
   allow_failures:
     - rvm: jruby-head
 
-script: "rake"
+script: "bundle exec rake"
 
 notifications:
   disable: true
diff --git a/Gemfile b/Gemfile
index 5f22d02..1b5b076 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,4 +7,8 @@ group :test do
   gem 'spy', '0.4.1'
   gem 'benchmark-ips'
   gem 'rubocop'
+
+  platform :mri do
+    gem 'liquid-c', github: 'Shopify/liquid-c', ref: '35e9aee48d639ae1d3ac9ba77616aca9800eab7d'
+  end
 end
diff --git a/Rakefile b/Rakefile
index 2e125ba..e3633f5 100755
--- a/Rakefile
+++ b/Rakefile
@@ -27,9 +27,22 @@ desc 'runs test suite with both strict and lax parsers'
 task :test do
   ENV['LIQUID_PARSER_MODE'] = 'lax'
   Rake::Task['base_test'].invoke
+
   ENV['LIQUID_PARSER_MODE'] = 'strict'
   Rake::Task['base_test'].reenable
   Rake::Task['base_test'].invoke
+
+  if RUBY_ENGINE == 'ruby'
+    ENV['LIQUID-C'] = '1'
+
+    ENV['LIQUID_PARSER_MODE'] = 'lax'
+    Rake::Task['base_test'].reenable
+    Rake::Task['base_test'].invoke
+
+    ENV['LIQUID_PARSER_MODE'] = 'strict'
+    Rake::Task['base_test'].reenable
+    Rake::Task['base_test'].invoke
+  end
 end
 
 task gem: :build
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 15d8d51..b8e4d9a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -15,6 +15,11 @@ if env_mode = ENV['LIQUID_PARSER_MODE']
 end
 Liquid::Template.error_mode = mode
 
+if ENV['LIQUID-C'] == '1'
+  puts "-- LIQUID C"
+  require 'liquid/c'
+end
+
 if Minitest.const_defined?('Test')
   # We're on Minitest 5+. Nothing to do here.
 else