diff --git a/fog-aws.gemspec b/fog-aws.gemspec
index c03d58a9b..efd3aa7c5 100644
--- a/fog-aws.gemspec
+++ b/fog-aws.gemspec
@@ -14,11 +14,10 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/fog/fog-aws"
   spec.license       = "MIT"
 
-  spec.files         = Dir['lib/**/*.rb', 'lib/**/*.json', 'tests/**/*',
+  spec.files         = Dir['lib/**/*.{rb,json}',
                            'CHANGELOG.md', 'CONTRIBUTING.md', 'CONTRIBUTORS.md',
                            'LICENSE.md', 'README.md', 'fog-aws.gemspec',]
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.0.0'