diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..9169f9af9
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - 2.2
+  - ruby-head
+
+sudo: false
+script: 'ci/travis.rb'
+before_install:
+  - gem install bundler
+  - "rm ${BUNDLE_GEMFILE}.lock"
+before_script:
+  - bundle update
+cache: bundler
+addons:
+  postgresql: "9.3"
diff --git a/Gemfile b/Gemfile
index c901c0e56..b9360ace8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -110,4 +110,7 @@ group :development, :test do
 
   # dev tools
   gem 'unicorn'
+
+  # for travis
+  gem 'rake'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 9097efcef..eb77b8396 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -478,6 +478,7 @@ DEPENDENCIES
   railroady (~> 1.3.0)
   rails (= 4.2.0)
   rails-settings-cached (~> 0.4.1)
+  rake
   ransack (~> 1.5.1)
   rspec-rails (~> 3.0.2)
   rubocop (~> 0.26.1)
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index 20e3f5f91..ac5b5159d 100644
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -30,7 +30,7 @@ begin
     end
 
     Rake::Task[:default].prerequisites.clear
-    task default: :test
+    task default: 'test:other'
 
     def test_against_server
       _stdin, _stdout, _stderr, wait_thr = Open3.popen3('unicorn -E test -p 8989')