diff --git a/.gitignore b/.gitignore
index c0490c1a..0de6f6c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ tmp
 coverage
 .ruby-version
 .ruby-gemset
+.idea
+gemfiles/*.gemfile.lock
diff --git a/.travis.yml b/.travis.yml
index 1c20c5aa..cb00d7e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,10 @@ env:
   - DB=postgres
   - DB=mysql
 
+gemfile:
+  - gemfiles/spree_3_1.gemfile
+  - gemfiles/spree_master.gemfile
+
 sudo: false
 cache: bundler
 before_script:
diff --git a/Appraisals b/Appraisals
new file mode 100644
index 00000000..7c7549ea
--- /dev/null
+++ b/Appraisals
@@ -0,0 +1,7 @@
+appraise 'spree-3-1' do
+  gem 'spree', '~> 3.1.0'
+end
+
+appraise 'spree-master' do
+  gem 'spree', github: 'spree/spree', branch: 'master'
+end
diff --git a/gemfiles/spree_3_1.gemfile b/gemfiles/spree_3_1.gemfile
new file mode 100644
index 00000000..cb08925e
--- /dev/null
+++ b/gemfiles/spree_3_1.gemfile
@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", "~> 3.1.0"
+gem "pg"
+gem "mysql2"
+
+gemspec :path => "../"
diff --git a/gemfiles/spree_master.gemfile b/gemfiles/spree_master.gemfile
new file mode 100644
index 00000000..54c236d3
--- /dev/null
+++ b/gemfiles/spree_master.gemfile
@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", :github => "spree/spree", :branch => "master"
+gem "pg"
+gem "mysql2"
+
+gemspec :path => "../"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1514ab75..80914289 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -20,6 +20,7 @@
 require 'shoulda-matchers'
 require 'ffaker'
 require 'pry'
+require 'versioncake/version'
 
 RSpec.configure do |config|
   config.fail_fast = false
@@ -32,9 +33,11 @@
     expectations.syntax = :expect
   end
 
-  config.include VersionCake::TestHelpers, type: :controller
-  config.before(:each, type: :controller) do
-    set_request_version('', 1)
+  if VersionCake::VERSION >= '3'
+    config.include VersionCake::TestHelpers, type: :controller
+    config.before(:each, type: :controller) do
+      set_request_version('', 1)
+    end
   end
 
   config.order = :random
diff --git a/spree_related_products.gemspec b/spree_related_products.gemspec
index 2cef53ba..dfe5210d 100644
--- a/spree_related_products.gemspec
+++ b/spree_related_products.gemspec
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'spree_backend', '>= 3.1.0', '< 4.0'
 
+  s.add_development_dependency 'appraisal'
   s.add_development_dependency 'factory_girl', '4.4'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'rspec-rails', '~> 3.1.0'