diff --git a/linux_admin.gemspec b/linux_admin.gemspec
index 097a046..c3e7936 100644
--- a/linux_admin.gemspec
+++ b/linux_admin.gemspec
@@ -21,9 +21,10 @@ registration, updates, etc.
   spec.homepage      = "http://github.com/ManageIQ/linux_admin"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files -- lib/*`.split("\n")
+  spec.files        += %w[README.md LICENSE.txt]
+  spec.executables   = `git ls-files -- bin/*`.split("\n")
+  spec.test_files    = `git ls-files -- spec/*`.split("\n")
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler",  "~> 1.3"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 544a52d..9a90db5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,7 +1,3 @@
-require 'coveralls'
-Coveralls.wear!
-
-require 'linux_admin'
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # Require this file using `require "spec_helper"` to ensure that it is only
@@ -28,6 +24,15 @@
   end
 end
 
+begin
+  require 'coveralls'
+  Coveralls.wear!
+rescue LoadError
+end
+
+require 'linux_admin'
+
+
 def data_file_path(to)
   File.expand_path(to, File.join(File.dirname(__FILE__), "data"))
 end