diff --git a/.travis.yml b/.travis.yml
index df3246bc8a..46f0fcfeae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,4 +6,4 @@ before_install:
   - gem update --system
   - gem update bundler
   - sh ./download-test_readline.sh
-script: rake ci-test
+script: bundle exec rake ci-test
diff --git a/test/helper.rb b/test/reline/helper.rb
similarity index 100%
rename from test/helper.rb
rename to test/reline/helper.rb
diff --git a/test/test_config.rb b/test/reline/test_config.rb
similarity index 100%
rename from test/test_config.rb
rename to test/reline/test_config.rb
diff --git a/test/test_history.rb b/test/reline/test_history.rb
similarity index 100%
rename from test/test_history.rb
rename to test/reline/test_history.rb
diff --git a/test/test_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb
similarity index 100%
rename from test/test_key_actor_emacs.rb
rename to test/reline/test_key_actor_emacs.rb
diff --git a/test/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb
similarity index 100%
rename from test/test_key_actor_vi.rb
rename to test/reline/test_key_actor_vi.rb
diff --git a/test/test_key_stroke.rb b/test/reline/test_key_stroke.rb
similarity index 100%
rename from test/test_key_stroke.rb
rename to test/reline/test_key_stroke.rb
diff --git a/test/test_kill_ring.rb b/test/reline/test_kill_ring.rb
similarity index 100%
rename from test/test_kill_ring.rb
rename to test/reline/test_kill_ring.rb
diff --git a/test/test_macro.rb b/test/reline/test_macro.rb
similarity index 100%
rename from test/test_macro.rb
rename to test/reline/test_macro.rb
diff --git a/test/test_within_pipe.rb b/test/reline/test_within_pipe.rb
similarity index 100%
rename from test/test_within_pipe.rb
rename to test/reline/test_within_pipe.rb