diff --git a/.gitignore b/.gitignore
index e82e89c..a621fa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ tags
 .rvmrc
 .ruby-version
 .ruby-gemset
+gemfiles/*.gemfile.lock
diff --git a/.travis.yml b/.travis.yml
index e62c049..5040a6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,28 @@
+sudo: required
+dist: trusty
+
 language: ruby
-rvm:
-  - 2.2.4
-  - 2.3.0
-sudo: false
-cache: bundler
-before_script:
-  - sh -e /etc/init.d/xvfb start
-  - export DISPLAY=:99.0
+
+env:
+  - DB=postgres
+  - DB=mysql
+
+gemfile:
+  - gemfiles/spree_3_1.gemfile
+  - gemfiles/spree_3_2.gemfile
+  - gemfiles/spree_master.gemfile
+
+script:
   - bundle exec rake test_app
-script: bundle exec rspec spec
+  - bundle exec rake spec
+
+rvm:
+  - 2.3.1
+  - 2.2.5
+
+addons:
+  apt:
+    packages:
+    - mysql-server-5.6
+    - mysql-client-core-5.6
+    - mysql-client-5.6
diff --git a/Appraisals b/Appraisals
new file mode 100644
index 0000000..96d5b09
--- /dev/null
+++ b/Appraisals
@@ -0,0 +1,13 @@
+appraise 'spree-3-1' do
+  gem 'spree', '~> 3.1.0'
+end
+
+appraise 'spree-3-2' do
+  gem 'spree', '~> 3.2.0.rc3'
+  gem 'rails-controller-testing'
+end
+
+appraise 'spree-master' do
+  gem 'spree', github: 'spree/spree', branch: 'master'
+  gem 'rails-controller-testing'
+end
diff --git a/Gemfile b/Gemfile
index dc8d2a7..8e92c71 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'spree', github: 'spree/spree', branch: 'master'
+spree_version = 'master'
+gem 'spree', github: 'spree/spree', branch: spree_version
 
 gemspec
diff --git a/README.md b/README.md
index 578d589..f55e946 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Spree::TaxCloud 
+Spree::TaxCloud
 =======================
 
 Spree::TaxCloud is a US sales tax extension for Spree using the Tax Cloud service.
@@ -21,6 +21,15 @@ Spree Configuration
 ## Installation
 
 1. Add this extension to your Gemfile with this line:
+
+  #### Spree >= 3.1
+
+  ```ruby
+  gem 'spree_tax_cloud', github: 'spree-contrib/spree_tax_cloud'
+  ```
+
+  #### Spree 3.0 and Spree 2.x
+
   ```ruby
   gem 'spree_tax_cloud', github: 'spree-contrib/spree_tax_cloud', branch: 'X-X-stable'
   ```
@@ -92,4 +101,4 @@ Discussion and pull requests addressing this functionality are welcomed.
 COPYRIGHT
 ---------
 
-[Copyright]( http://jet.mit-license.org/ ) by Jerrold R Thompson 
+[Copyright]( http://jet.mit-license.org/ ) by Jerrold R Thompson
diff --git a/gemfiles/spree_3_1.gemfile b/gemfiles/spree_3_1.gemfile
new file mode 100644
index 0000000..925b090
--- /dev/null
+++ b/gemfiles/spree_3_1.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", "~> 3.1.0"
+
+gemspec :path => "../"
diff --git a/gemfiles/spree_3_2.gemfile b/gemfiles/spree_3_2.gemfile
new file mode 100644
index 0000000..0905ab9
--- /dev/null
+++ b/gemfiles/spree_3_2.gemfile
@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", "~> 3.2.0.rc3"
+gem "rails-controller-testing"
+
+gemspec :path => "../"
diff --git a/gemfiles/spree_master.gemfile b/gemfiles/spree_master.gemfile
new file mode 100644
index 0000000..c382de2
--- /dev/null
+++ b/gemfiles/spree_master.gemfile
@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", :github => "spree/spree", :branch => "master"
+gem "rails-controller-testing"
+
+gemspec :path => "../"
diff --git a/lib/spree_tax_cloud.rb b/lib/spree_tax_cloud.rb
index 4ff67bf..d47ca0d 100644
--- a/lib/spree_tax_cloud.rb
+++ b/lib/spree_tax_cloud.rb
@@ -1,7 +1,7 @@
-require 'sass/rails'
 require 'spree_api'
 require 'spree_backend'
 require 'spree_core'
 require 'spree_tax_cloud/engine'
 require 'spree_tax_cloud/error'
 require 'tax_cloud'
+require 'sass/rails'
diff --git a/spree_tax_cloud.gemspec b/spree_tax_cloud.gemspec
index f0502df..8d47d85 100644
--- a/spree_tax_cloud.gemspec
+++ b/spree_tax_cloud.gemspec
@@ -18,19 +18,22 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_backend', spree_version
   s.add_dependency 'spree_core', spree_version
 
-  s.add_runtime_dependency 'savon', '~> 2.5.1'
-  s.add_runtime_dependency 'tax_cloud', '~> 0.3.0'
+  s.add_runtime_dependency 'savon'
+  s.add_runtime_dependency 'tax_cloud'
 
   s.add_development_dependency 'spree_frontend', spree_version
-  s.add_development_dependency 'capybara', '2.5'
+  s.add_development_dependency 'capybara'
   s.add_development_dependency 'poltergeist'
   s.add_development_dependency 'coffee-rails'
   s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'factory_girl_rails', '~> 4.2'
+  s.add_development_dependency 'factory_girl_rails'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'generator_spec'
-  s.add_development_dependency 'rspec-rails',        '~> 3.4'
-  s.add_development_dependency 'sass-rails',         '~> 5.0.0'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'pg'
+  s.add_development_dependency 'mysql2'
 end