diff --git a/.travis.yml b/.travis.yml
index f1ea16d8..0c03e389 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,15 @@
 env:
   - DB=mysql
   - DB=sqlite
-before_install: sudo apt-get install libicu-dev -y
+before_install:
+  - sudo apt-get install libicu-dev -y
+  - echo "yes" | gem uninstall json ffi
 branches:
   only:
     - 'master'
 rvm:
   - 1.9.2
+  - 1.9.3
 before_script:
   - "cp config/database.yml.$DB config/database.yml"
   - "cp config/gitlab.yml.example config/gitlab.yml"
diff --git a/Gemfile b/Gemfile
index 5cfcca2f..8342e1c3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,6 +65,6 @@ end
 group :test do
   gem "turn", :require => false
   gem "simplecov", :require => false
-  gem "shoulda", "3.0.1"
+  gem "shoulda-matchers"
   gem 'email_spec'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index d3c07f66..2f4e4617 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -269,10 +269,6 @@ GEM
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.0)
     shoulda-matchers (1.0.0)
     simplecov (0.6.4)
       multi_json (~> 1.0)
@@ -368,7 +364,7 @@ DEPENDENCIES
   rspec-rails
   sass-rails (= 3.2.3)
   seed-fu
-  shoulda (= 3.0.1)
+  shoulda-matchers
   simplecov
   six
   sqlite3