diff --git a/.travis.yml b/.travis.yml
index 69ade0192..c7f69cbfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ language: scala
 
 # TODO - we'd like to actually test everything, but the process library has a deadlock right now
 jdk:
-  - openjdk6
-#  - oraclejdk7
+  - openjdk7
+  - oraclejdk7
 
 env:
   matrix:
diff --git a/project/Release.scala b/project/Release.scala
index 30c103b25..fbe2f255d 100644
--- a/project/Release.scala
+++ b/project/Release.scala
@@ -20,6 +20,6 @@ object Release {
   )
 
   def javaVersionCheckSettings = Seq(
-    javaVersionPrefix in javaVersionCheck := Some("1.6")
+    javaVersionPrefix in javaVersionCheck := Some("1.7")
   )
 }