diff --git a/.travis.yml b/.travis.yml
index aa59761e6..65ec7dbe0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ env:
   - RAILS_VERSION="~>4.0.0"
   - RAILS_VERSION="~>4.1.0"
   - RAILS_VERSION="~>4.2.0"
-script: "rake spec:all"
+script: "bundle exec rake spec:all"
 before_install:
  - sudo apt-get update
  - sudo apt-get install idn
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index bb85032d5..879b2ebf6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -19,13 +19,8 @@ GENERATED_DIR = File.expand_path(File.join(ROOT_DIR, 'generated'))
 THIRD_PARTY_DIR = File.expand_path(File.join(ROOT_DIR, 'third_party'))
 FIXTURES_DIR = File.expand_path(File.join(SPEC_DIR, 'fixtures'))
 
-$LOAD_PATH.unshift(SPEC_DIR)
-$LOAD_PATH.unshift(LIB_DIR)
-$LOAD_PATH.unshift(GENERATED_DIR)
-$LOAD_PATH.unshift(THIRD_PARTY_DIR)
 $LOAD_PATH.uniq!
 
-
 if defined?(JRUBY_VERSION)
   puts 'Skipping coverage on JRuby'
 else
diff --git a/spec/spec_helper/load_path_spec.rb b/spec/spec_helper/load_path_spec.rb
new file mode 100644
index 000000000..9f6c70ad3
--- /dev/null
+++ b/spec/spec_helper/load_path_spec.rb
@@ -0,0 +1,33 @@
+# Copyright 2015 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+
+RSpec.describe $LOAD_PATH do
+  it('should contain SPEC_DIR') do
+    expect($LOAD_PATH).to include(SPEC_DIR)
+  end
+
+  it('should contain LIB_DIR') do
+    expect($LOAD_PATH).to include(LIB_DIR)
+  end
+
+  it('should contain GENERATED_DIR') do
+    expect($LOAD_PATH).to include(GENERATED_DIR)
+  end
+
+  it('should contain THIRD_PARTY_DIR') do
+    expect($LOAD_PATH).to include(THIRD_PARTY_DIR)
+  end
+end