diff --git a/google-api-client.gemspec b/google-api-client.gemspec
index 4b2ee2e7e..707b750c7 100644
--- a/google-api-client.gemspec
+++ b/google-api-client.gemspec
@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'google/apis/version'
@@ -12,9 +11,11 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/google/google-api-ruby-client'
   spec.license       = 'Apache 2.0'
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`
+                       .split("\x0")
+                       .reject { |f| f.match(%r{^(spec|script)/|^api_names_out}) }
+
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib', 'generated', 'third_party']
 
   spec.required_ruby_version = '~> 2.0'
diff --git a/spec/google/api_client/client_secrets_spec.rb b/spec/google/api_client/client_secrets_spec.rb
index 8964c7d94..30c64c4cc 100644
--- a/spec/google/api_client/client_secrets_spec.rb
+++ b/spec/google/api_client/client_secrets_spec.rb
@@ -1,5 +1,3 @@
-# encoding:utf-8
-
 # Copyright 2013 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");