diff --git a/ruby/travis-test.sh b/ruby/travis-test.sh
index 4a2536a5b8..9ec7eb22c0 100755
--- a/ruby/travis-test.sh
+++ b/ruby/travis-test.sh
@@ -5,13 +5,22 @@ set -e
 
 test_version() {
   version=$1
-  bash --login -c \
-    "rvm install $version && rvm use $version && \
-     which ruby && \
-     gem install bundler && bundle && \
-     rake test && \
-     cd ../conformance && \
-     make test_ruby"
+  if [ "$version" == "jruby" ] ; then
+    # No conformance tests yet -- JRuby is too broken to run them.
+    bash --login -c \
+      "rvm install $version && rvm use $version && \
+       which ruby && \
+       gem install bundler && bundle && \
+       rake test"
+  else
+    bash --login -c \
+      "rvm install $version && rvm use $version && \
+       which ruby && \
+       gem install bundler && bundle && \
+       rake test && \
+       cd ../conformance && \
+       make test_ruby"
+  fi
 }
 
 test_version $1