diff --git a/.travis.yml b/.travis.yml
index a3bfc8aa..b85fb4f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,25 @@
+sudo: required
+dist: trusty
 language: scala
 scala:
    - 2.11.8
-jdk:
-  - oraclejdk8
-  - oraclejdk7
\ No newline at end of file
+   - 2.12.0-M4
+env:
+- JDK=oraclejdk8
+- JDK=openjdk8
+- JDK=oraclejdk7
+- JDK=openjdk7
+before_script:
+  - jdk_switcher use $JDK
+    #https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913
+  - cat /etc/hosts # optionally check the content *before*
+  - sudo hostname "$(hostname | cut -c1-63)"
+  - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
+  - cat /etc/hosts # optionally check the content *after*
+matrix:
+  # scala 2.12 require java 8
+  exclude:
+    - scala: 2.12.0-M4
+      env: JDK=oraclejdk7
+    - scala: 2.12.0-M4
+      env: JDK=openjdk7
diff --git a/project/Common.scala b/project/Common.scala
index 1466efc7..cc7dfaef 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -16,12 +16,11 @@ object Common {
       // Core settings
       organization := "com.typesafe.scala-logging",
       scalaVersion := Version.scala,
-      crossScalaVersions := List(scalaVersion.value),
+      crossScalaVersions := Version.crossScala,
       scalacOptions ++= List(
         "-unchecked",
         "-deprecation",
         "-language:_",
-        "-target:jvm-1.6",
         "-encoding", "UTF-8"
       ),
       unmanagedSourceDirectories in Compile := List((scalaSource in Compile).value),
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 4040c11a..9ddec540 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -2,8 +2,9 @@ import sbt._
 
 object Version {
   val logback   = "1.1.7"
-  val mockito   = "1.9.5"
+  val mockito   = "1.10.19"
   val scala     = "2.11.8"
+  val crossScala = List(scala, "2.12.0-M4")
   val scalaTest = "2.2.6"
   val slf4j     = "1.7.21"
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
index c7f590fa..4831faea 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,7 +2,7 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
 
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.3")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")