diff --git a/.travis.yml b/.travis.yml
index 10a49eb..0791245 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 language: scala
 scala:
 - 2.11.7
+- 2.12.0-M2
+jdk:
+- oraclejdk8
 git:
   depth: 1
 cache:
diff --git a/build.sbt b/build.sbt
index a13028e..0a6f79d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -13,7 +13,7 @@ libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _)
 libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _)
 
 libraryDependencies ++= Seq(
-  "org.scala-js" %% "scalajs-library" % "0.6.2" % "test",
+  "org.scala-js" %% "scalajs-library" % "0.6.5" % "test",
   "junit" % "junit" % "4.12" % "test",
   "com.novocode" % "junit-interface" % "0.11" % "test"
 )
diff --git a/src/main/scala/streams/ops/ArrayOpsOps.scala b/src/main/scala/streams/ops/ArrayOpsOps.scala
index 731f94b..1964453 100644
--- a/src/main/scala/streams/ops/ArrayOpsOps.scala
+++ b/src/main/scala/streams/ops/ArrayOpsOps.scala
@@ -18,10 +18,20 @@ private[streams] trait ArrayOpsOps
             "charArrayOps" |
             "booleanArrayOps" |
             "floatArrayOps" |
-            "doubleArrayOps")) |
+            "doubleArrayOps" |
+            // These now have a _ prefix in 2.12.0-M2:
+            "_intArrayOps" |
+            "_longArrayOps" |
+            "_byteArrayOps" |
+            "_shortArrayOps" |
+            "_charArrayOps" |
+            "_booleanArrayOps" |
+            "_floatArrayOps" |
+            "_doubleArrayOps")) |
           TypeApply(
             Select(Predef(), N(
               "refArrayOps" |
+              "_refArrayOps" |
               "genericArrayOps")),
             List(_)),
           List(array)) =>