diff --git a/build.sbt b/build.sbt
index 9a06f5e..a9122f6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,9 +2,9 @@ name := "acked-streams"
 
 organization := "com.timcharper"
 
-scalaVersion := "2.13.2"
+scalaVersion := "2.13.6"
 
-crossScalaVersions := Seq("2.12.11", "2.13.2")
+crossScalaVersions := Seq("2.12.15", "2.13.6")
 
 val appProperties = {
   val prop = new java.util.Properties()
@@ -13,8 +13,8 @@ val appProperties = {
 }
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-stream"  % "2.5.31",
-  "org.scalatest"     %% "scalatest"    % "3.1.1" % "test")
+  "com.typesafe.akka" %% "akka-stream"  % "2.6.17",
+  "org.scalatest"     %% "scalatest"    % "3.2.10" % "test")
 
 version := appProperties.getProperty("version")
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 6300980..d67bdca 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1 +1,2 @@
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.18-1")
diff --git a/src/test/scala/com/timcharper/acked/AckedSinkSpec.scala b/src/test/scala/com/timcharper/acked/AckedSinkSpec.scala
index b1132fb..4ef2258 100644
--- a/src/test/scala/com/timcharper/acked/AckedSinkSpec.scala
+++ b/src/test/scala/com/timcharper/acked/AckedSinkSpec.scala
@@ -2,11 +2,12 @@ package com.timcharper.acked
 
 import akka.pattern.ask
 import akka.stream.ActorMaterializer
-import org.scalatest.{FunSpec, Matchers}
 import scala.concurrent.{Future, Promise}
 import scala.util.{Failure, Success, Try}
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class AckedSinkSpec extends FunSpec with Matchers with ActorSystemTest {
+class AckedSinkSpec extends AnyFunSpec with Matchers with ActorSystemTest {
 
   describe("head") {
     it("acknowledges only the first element") {
diff --git a/src/test/scala/com/timcharper/acked/AckedSourceSpec.scala b/src/test/scala/com/timcharper/acked/AckedSourceSpec.scala
index fe287f9..f10d259 100644
--- a/src/test/scala/com/timcharper/acked/AckedSourceSpec.scala
+++ b/src/test/scala/com/timcharper/acked/AckedSourceSpec.scala
@@ -9,14 +9,15 @@ import akka.stream.Materializer
 import akka.stream.Supervision
 import akka.stream.scaladsl.Keep
 import akka.stream.scaladsl.{Sink, Source}
-import org.scalatest.{FunSpec, Matchers}
 
 import scala.concurrent.{ExecutionContext, Future, Promise}
 import scala.concurrent.duration._
 import scala.util.Random
 import scala.util.{Failure, Success, Try}
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class AckedSourceSpec extends FunSpec with Matchers with ActorSystemTest {
+class AckedSourceSpec extends AnyFunSpec with Matchers with ActorSystemTest {
   describe("AckedSource operations") {
     def runLeTest[T, U](input: scala.collection.immutable.Iterable[T] =
                           Range(1, 20))(
diff --git a/src/test/scala/com/timcharper/acked/ComponentsSpec.scala b/src/test/scala/com/timcharper/acked/ComponentsSpec.scala
index 6206f19..e263cf0 100644
--- a/src/test/scala/com/timcharper/acked/ComponentsSpec.scala
+++ b/src/test/scala/com/timcharper/acked/ComponentsSpec.scala
@@ -1,6 +1,5 @@
 package com.timcharper.acked
 
-import org.scalatest.{FunSpec, Matchers}
 
 import akka.stream.Attributes
 import akka.stream.OverflowStrategy
@@ -11,8 +10,10 @@ import scala.concurrent.Promise
 import scala.collection.mutable._
 import scala.util.{Try, Success, Failure}
 import scala.concurrent.duration._
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class ComponentsSpec extends FunSpec with Matchers with ActorSystemTest {
+class ComponentsSpec extends AnyFunSpec with Matchers with ActorSystemTest {
   trait Fixtures {
     implicit val materializer = akka.stream.ActorMaterializer()