diff --git a/.travis.yml b/.travis.yml
index f5cf6fa5..01a6738c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,25 @@
+# use Docker-based container (instead of OpenVZ)
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.ivy2/cache
+    # Cache the sbt launcher, currently the Travis VM preinstalls 0.13.5
+    - $HOME/.sbt/launchers/0.13.7
+    # Cache scala, currently the Travis VM preinstalls 2.11.2 & 2.10.4
+    #- $HOME/.sbt/boot/scala-$TRAVIS_SCALA_VERSION
+
+    # Updates regarding Travis VM preinstalls:
+    # https://github.com/travis-ci/travis-cookbooks/blob/master/changes.md
+
 language: scala
+
+jdk:
+  - openjdk6
+
+script:
+  - sbt ++$TRAVIS_SCALA_VERSION test
+
+  # Remove to avoid unnecessary cache updates
+  - find $HOME/.sbt -name "*.lock" -delete
+  - find $HOME/.ivy2 -name "ivydata-*.properties" -delete
diff --git a/README.md b/README.md
index 0015d84b..243b9a72 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 Configuration library for JVM languages.
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.typesafe/config/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.typesafe/config)
+[![Build Status](https://travis-ci.org/typesafehub/config.svg?branch=master)](https://travis-ci.org/typesafehub/config)
 
 
 ## Overview