diff --git a/.java-version b/.java-version
index d3bdbdf1f..625934097 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-1.7
+1.8
diff --git a/.travis.yml b/.travis.yml
index 895984e79..e19b3364a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,11 @@
 language: scala
 
-scala: 2.11.8
+scala:
+  - 2.11.8
+  - 2.12.1
 
 script:
-  - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "so test"
+  - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "plz $TRAVIS_SCALA_VERSION test"
+
+jdk:
+  - oraclejdk8
diff --git a/build.sbt b/build.sbt
index 4ac7d0e02..472e444b2 100644
--- a/build.sbt
+++ b/build.sbt
@@ -14,13 +14,13 @@ def commonSettings: Seq[Setting[_]] = Seq(
   // concurrentRestrictions in Global += Util.testExclusiveRestriction,
   testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
   javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"),
-  crossScalaVersions := Seq(scala211),
+  crossScalaVersions := Seq(scala211, scala212),
   scalacOptions ++= Seq("-Ywarn-unused", "-Ywarn-unused-import"),
   scalacOptions --= // scalac 2.10 rejects some HK types under -Xfuture it seems..
     (CrossVersion partialVersion scalaVersion.value collect { case (2, 10) => List("-Xfuture", "-Ywarn-unused", "-Ywarn-unused-import") }).toList.flatten,
   scalacOptions in console in Compile -= "-Ywarn-unused-import",
   scalacOptions in console in Test    -= "-Ywarn-unused-import",
-  previousArtifact := None, // Some(organization.value %% moduleName.value % "1.0.0"),
+  mimaPreviousArtifacts := Set(), // Some(organization.value %% moduleName.value % "1.0.0"),
   publishArtifact in Compile := true,
   publishArtifact in Test := false
 )
@@ -154,8 +154,11 @@ lazy val utilScripted = (project in internalPath / "util-scripted").
     commonSettings,
     name := "Util Scripted",
     libraryDependencies ++= {
-      if (scalaVersion.value startsWith "2.11") Seq(parserCombinator211)
-      else Seq()
+      scalaVersion.value match {
+        case sv if sv startsWith "2.11" => Seq(parserCombinator211)
+        case sv if sv startsWith "2.12" => Seq(parserCombinator211)
+        case _ => Seq()
+      }
     }
   ).
   configure(addSbtIO)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index fe0fb53a5..31dcb5381 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -4,7 +4,7 @@ import Keys._
 object Dependencies {
   val scala210 = "2.10.6"
   val scala211 = "2.11.8"
-  val scala212 = "2.12.0"
+  val scala212 = "2.12.1"
 
   private val sbtIO = "org.scala-sbt" %% "io" % "1.0.0-M7"
 
@@ -31,8 +31,8 @@ object Dependencies {
   val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value }
   val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value }
 
-  val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.13.1"
-  val scalatest = "org.scalatest" %% "scalatest" % "2.2.6"
+  val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.13.4"
+  val scalatest = "org.scalatest" %% "scalatest" % "3.0.1"
 
   val parserCombinator211 = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4"
 
diff --git a/project/house.sbt b/project/house.sbt
index 555559b37..bad061ebe 100644
--- a/project/house.sbt
+++ b/project/house.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.1")
+addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.2")