diff --git a/.travis.yml b/.travis.yml
index c8f45bff7..3e2560c1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,3 +21,6 @@ addons:
       - zlib1g-dev
       - liblzma-dev
       - libcurl4-openssl-dev
+script:
+  - bundle exec rake build
+  - bundle exec rake builddoc
diff --git a/Gemfile b/Gemfile
index bfea88ee6..ac948cae7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -77,19 +77,6 @@ end
 
 # For running unit tests
 group :test do
-
-  if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
-    module Kernel
-      alias :_at_exit :at_exit
-      def at_exit(&block)
-        _at_exit do
-        exit_status = $!.status if $!.is_a?(SystemExit)
-        block.call
-        exit exit_status if exit_status
-      end
-      end
-    end
-  end
   if ENV['BEEF_TEST']
     gem 'test-unit'
     gem 'test-unit-full'
diff --git a/test/unit/tc_filesystem.rb b/test/unit/tc_filesystem.rb
index 48a8a81ea..98ef13d97 100644
--- a/test/unit/tc_filesystem.rb
+++ b/test/unit/tc_filesystem.rb
@@ -34,7 +34,6 @@ class TC_Filesystem < Test::Unit::TestCase
     user_cred=YAML.load_file(test_file)
     x= user_cred['beef']['credentials']
     assert_equal({"passwd"=>"beef", "user"=>"beef"}, x, 'The default creds are not set' )
-    exit 1
   end
 
   def test_install_file