diff --git a/.travis.yml b/.travis.yml
index 690c9473..dd8cb2e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: scala
 os: linux
 jdk:
+  - openjdk11
   - openjdk8
 
 cache:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fb347cf..15003b25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
 ### Added
 
 - [Build] Setup formatting using `scalafmt`
+- [CI] Build & test on both JDK 8 and 11 
 
 ### Changed
 
diff --git a/build.sbt b/build.sbt
index 9cc08507..799566a7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -47,7 +47,6 @@ val junitVersion = "4.13.1"
 
 lazy val commonSettings = Seq(
   libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
-  scalacOptions += "-target:jvm-1.8",
   scalacOptions ++= {
     CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((2, 11)) => ScalacOptions.scalacOptions211
diff --git a/cucumber-scala/src/test/scala/io/cucumber/scala/ScalaDslStepsTest.scala b/cucumber-scala/src/test/scala/io/cucumber/scala/ScalaDslStepsTest.scala
index 799542e1..b406ab15 100644
--- a/cucumber-scala/src/test/scala/io/cucumber/scala/ScalaDslStepsTest.scala
+++ b/cucumber-scala/src/test/scala/io/cucumber/scala/ScalaDslStepsTest.scala
@@ -74,7 +74,7 @@ class ScalaDslStepsTest {
       glue.registry.stepDefinitions.head,
       """Oh boy, (\d+) (\s+) cukes""",
       "ScalaDslStepsTest.scala:65",
-      Array(new java.lang.Integer(5), "green"),
+      Array(java.lang.Integer.valueOf(5), "green"),
       thenumber == 5 && thecolour == "green"
     )
   }
@@ -185,7 +185,7 @@ class ScalaDslStepsTest {
       Glue.registry.stepDefinitions.head,
       """Oh boy, (\d+) (\s+) cukes""",
       "ScalaDslStepsTest.scala:178",
-      Array(new java.lang.Integer(5), "green"),
+      Array(java.lang.Integer.valueOf(5), "green"),
       thenumber == 5 && thecolour == "green"
     )
   }
diff --git a/project/ScalacOptions.scala b/project/ScalacOptions.scala
index 2747bb19..948e0900 100644
--- a/project/ScalacOptions.scala
+++ b/project/ScalacOptions.scala
@@ -56,7 +56,8 @@ object ScalacOptions {
     "-encoding",
     "UTF-8", // yes, this is 2 args
     "-feature",
-    "-language:implicitConversions"
+    "-language:implicitConversions",
+    "-target:jvm-1.8"
   )
 
 }