diff --git a/.travis.yml b/.travis.yml
index 913f4ea0..91cd291b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,10 @@ env:
   - RAKE_TASK=spec
   # We run the tests in different environments so they don't try to overwrite each other (deleting, creating the same VPC)
   # If we need to we can get rid of this but its nice for speed
-  - RAKE_TASK="travis[integration]" AWS_TRAVIS_DRIVER=aws::us-west-2
-  - RAKE_TASK="travis[super_slow]" AWS_TRAVIS_DRIVER=aws::us-west-1
+  - RAKE_TASK="travis[integration]" AWS_TEST_DRIVER=aws::us-west-2
+  - RAKE_TASK="travis[super_slow]" AWS_TEST_DRIVER=aws::us-west-1
   # machine_image is a special snowflake - they take so long to run we need to give them their own builder
-  - RAKE_TASK="machine_image" AWS_TRAVIS_DRIVER=aws::eu-west-1
+  - RAKE_TASK="machine_image" AWS_TEST_DRIVER=aws::eu-west-1
 
 bundler_args: --jobs 7 --without docs debug
 
diff --git a/chef-provisioning-aws.gemspec b/chef-provisioning-aws.gemspec
index 3ee43d07..b3354aea 100644
--- a/chef-provisioning-aws.gemspec
+++ b/chef-provisioning-aws.gemspec
@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef-provisioning", ">= 1.0", "< 3.0"
 
-  s.add_dependency "aws-sdk", [">= 2.2.18", "< 3.0"]
-  s.add_dependency "retryable", "~> 2.0", ">= 2.0.1"
-  s.add_dependency "ubuntu_ami", "~> 0.4", ">= 0.4.1"
+  s.add_dependency 'aws-sdk', ['>= 2.2.18', '< 4.0']
+  s.add_dependency 'retryable', '~> 2.0', '>= 2.0.1'
+  s.add_dependency 'ubuntu_ami', '~> 0.4', '>= 0.4.1'
 
   s.bindir       = "bin"
   s.executables  = %w{}
diff --git a/lib/chef/provisioning/aws_driver/version.rb b/lib/chef/provisioning/aws_driver/version.rb
index 473a62e5..9fedd24c 100644
--- a/lib/chef/provisioning/aws_driver/version.rb
+++ b/lib/chef/provisioning/aws_driver/version.rb
@@ -1,7 +1,7 @@
 class Chef
-  module Provisioning
-    module AWSDriver
-      VERSION = "3.0.5".freeze
-    end
-  end
+module Provisioning
+module AWSDriver
+  VERSION = '4.0.0'
+end
+end
 end
diff --git a/lib/chef/resource/aws_nat_gateway.rb b/lib/chef/resource/aws_nat_gateway.rb
index 5c37e7c1..fbbbd43e 100644
--- a/lib/chef/resource/aws_nat_gateway.rb
+++ b/lib/chef/resource/aws_nat_gateway.rb
@@ -15,7 +15,7 @@
 # We provide this class because the AWS SDK V2 does not provide it (as of
 # May 2016). We copied the pattern in their SDK so when they do add a real
 # resource there shouldn't be a need for much translation.
-class Aws::EC2::NatGateway < ::Aws::Resources::Resource
+class Aws::EC2::NatGateway # < ::Aws::Resources::Resource
   attr_reader :resource, :id, :nat_gateway_id, :vpc_id, :subnet_id, :nat_gateway_addresses
 
   def initialize(id, options = {})