diff --git a/.travis.yml b/.travis.yml
index 4bcca11..0c2890a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,23 @@
-sudo: false
 language: scala
 
-jdk:
-  - oraclejdk8
+env:
+  - TRAVIS_JDK=8
+  - TRAVIS_JDK=11
+
+before_install: curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh
+install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx32m -version
 
 script:
-  - sbt +test
-  - sbt +publishLocal
+  - sbt +test +publishLocal
+
+sudo: false
 
 cache:
   directories:
-    - $HOME/.ivy2/cache
-    
+    - "$HOME/.coursier/cache"
+    - "$HOME/.ivy2/cache"
+    - "$HOME/.jabba/jdk"
+
 before_cache:
   # Delete all ivydata files
   - find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
-
diff --git a/build.sbt b/build.sbt
index 8c5cf2a..6a71827 100755
--- a/build.sbt
+++ b/build.sbt
@@ -2,23 +2,23 @@ organization := "com.typesafe"
 name := "jse"
 
 scalaVersion := "2.10.7"
-crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.12.7")
+crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.12.10")
 
 libraryDependencies ++= {
   val akkaVersion = scalaBinaryVersion.value match {
     case "2.10" => "2.3.16"
-    case "2.11" => "2.3.16"
-    case "2.12" => "2.5.18"
+    case "2.11" => "2.5.26"
+    case "2.12" => "2.6.0"
   }
   Seq(
     "com.typesafe.akka" %% "akka-actor" % akkaVersion,
     "io.apigee.trireme" % "trireme-core" % "0.9.4",
     "io.apigee.trireme" % "trireme-node10src" % "0.9.4",
     "io.spray" %% "spray-json" % "1.3.5",
-    "org.slf4j" % "slf4j-api" % "1.7.25",
+    "org.slf4j" % "slf4j-api" % "1.7.29",
     "com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test",
     "junit" % "junit" % "4.12" % "test",
-    "org.slf4j" % "slf4j-simple" % "1.7.25" % "test",
+    "org.slf4j" % "slf4j-simple" % "1.7.29" % "test",
     "org.specs2" %% "specs2-core" % "3.10.0" % "test"
   )
 }
diff --git a/project/build.properties b/project/build.properties
index 133a8f1..8e682c5 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=0.13.18
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 7607029..b2707a3 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,7 +2,7 @@ libraryDependencies ++= Seq(
   "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
 )
 
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.10")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.12")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
 addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
diff --git a/src/test/scala-2.11/com/typesafe/jse/AkkaCompat.scala b/src/test/scala-2.11/com/typesafe/jse/AkkaCompat.scala
index 1a3abc6..11378d5 100644
--- a/src/test/scala-2.11/com/typesafe/jse/AkkaCompat.scala
+++ b/src/test/scala-2.11/com/typesafe/jse/AkkaCompat.scala
@@ -1,10 +1,11 @@
 package com.typesafe.jse
 
 import akka.actor.ActorSystem
+import scala.concurrent.Await
+import scala.concurrent.duration._
 
 object AkkaCompat {
   def terminate(system: ActorSystem): Unit = {
-    system.shutdown()
-    system.awaitTermination()
+    Await.ready(system.terminate(), 10.seconds)
   }
 }