diff --git a/.travis.yml b/.travis.yml
index 54af71a..b3fcb1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ matrix:
 gemfile:
   - gemfiles/spree_3_2.gemfile
   - gemfiles/spree_3_3.gemfile
-  - gemfiles/spree_3_6.gemfile
+  - gemfiles/spree_3_7.gemfile
   - gemfiles/spree_master.gemfile
 
 before_install:
diff --git a/Appraisals b/Appraisals
index 5bb2e9f..e7bec83 100644
--- a/Appraisals
+++ b/Appraisals
@@ -8,9 +8,9 @@ appraise 'spree-3-3' do
   gem 'spree_backend', '~> 3.3.0'
 end
 
-appraise 'spree-3-6' do
-  gem 'spree_core', '~> 3.6.0'
-  gem 'spree_backend', '~> 3.6.0'
+appraise 'spree-3-7' do
+  gem 'spree_core', '~> 3.7.0'
+  gem 'spree_backend', '~> 3.7.0'
 end
 
 appraise 'spree-master' do
diff --git a/gemfiles/spree_3_6.gemfile b/gemfiles/spree_3_7.gemfile
similarity index 78%
rename from gemfiles/spree_3_6.gemfile
rename to gemfiles/spree_3_7.gemfile
index f942c47..6753a46 100644
--- a/gemfiles/spree_3_6.gemfile
+++ b/gemfiles/spree_3_7.gemfile
@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "spree_core", "~> 3.6.0"
-gem "spree_backend", "~> 3.6.0"
+gem "spree_core", "~> 3.7.0"
+gem "spree_backend", "~> 3.7.0"
 gem "codeclimate-test-reporter", group: :test, require: nil
 gem "pry", group: [:test, :development]
 gem "rails-controller-testing"
diff --git a/spec/factories/avalara_factories.rb b/spec/factories/avalara_factories.rb
index 889e46f..97d394e 100644
--- a/spec/factories/avalara_factories.rb
+++ b/spec/factories/avalara_factories.rb
@@ -66,10 +66,10 @@
 
   # Adding this modifier since US country name changes between solidus versions
   factory :country, class: Spree::Country do
-    iso_name { 'UNITED STATES' }
-    name { 'United States' }
-    iso { 'US' }
-    iso3 { 'USA' }
-    numcode { 840 }
+    sequence(:iso_name) { |n| "ISO_NAME_#{n}" }
+    sequence(:name)     { |n| "NAME_#{n}" }
+    sequence(:iso)      { |n| "I#{n}" }
+    sequence(:iso3)     { |n| "IS#{n}" }
+    numcode             { 840 }
   end
 end
diff --git a/spec/features/vat_spec.rb b/spec/features/vat_spec.rb
index d21a826..5182329 100644
--- a/spec/features/vat_spec.rb
+++ b/spec/features/vat_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "VAT", :vcr do
-  let!(:us) { create(:country, iso: 'US', name: 'United States') }
+  let!(:us) { create(:country, iso: 'US', name: 'United States', iso_name: 'UNITED STATES') }
   let!(:it) { create(:country, iso: 'IT', name: 'Italy', iso_name: 'ITALY') }
   let!(:nl) { create(:country, iso: 'NL', name: 'Netherlands', iso_name: 'NETHERLANDS') }
   let!(:fr) { create(:country, iso: 'FR', name: 'France', iso_name: 'FRANCE') }
@@ -151,4 +151,3 @@ def prep_avalara_order
     avalara_order.next!
   end
 end
-
diff --git a/spec/models/spree/address_decorator_spec.rb b/spec/models/spree/address_decorator_spec.rb
index ecab858..3eb12ef 100644
--- a/spec/models/spree/address_decorator_spec.rb
+++ b/spec/models/spree/address_decorator_spec.rb
@@ -2,6 +2,8 @@
 
 describe Spree::Address, type: :model do
   let(:address) { build(:address) }
+  before { address.country.update(name: 'United States') }
+
 
   describe '#validation_enabled?' do
     it 'returns true if preference is true and country validation is enabled' do
diff --git a/spec/models/spree_avatax_certified/address_spec.rb b/spec/models/spree_avatax_certified/address_spec.rb
index 6e53f0a..613adb3 100644
--- a/spec/models/spree_avatax_certified/address_spec.rb
+++ b/spec/models/spree_avatax_certified/address_spec.rb
@@ -4,6 +4,8 @@
   let(:address){ build(:address) }
   let(:order) { build(:avalara_order, ship_address: address) }
 
+  before { address.country.update(name: 'United States') }
+
   before do
     Spree::Config.avatax_address_validation = true
   end
diff --git a/spree_avatax_certified.gemspec b/spree_avatax_certified.gemspec
index 723433f..996aa06 100644
--- a/spree_avatax_certified.gemspec
+++ b/spree_avatax_certified.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  spree_version = '>= 3.2.0', '< 4.0'
+  spree_version = '>= 3.2.0', '< 5.0'
   s.add_runtime_dependency 'spree_core', spree_version
   s.add_runtime_dependency 'spree_backend', spree_version
   s.add_runtime_dependency 'spree_extension'
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'sqlite3', '~> 1.3.6'
   s.add_development_dependency 'mysql2', '~> 0.5.1'
   s.add_development_dependency 'shoulda-matchers'
   s.add_development_dependency 'vcr'