diff --git a/build.sbt b/build.sbt
index 8564666..c9380e9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -16,7 +16,7 @@ val refinedVersion = "0.9.14"
 val scalacheckShapelessVersion = "1.2.5"
 val scalajsJqueryVersion = "1.0.0"
 val scalajsReactVersion = "1.7.1"
-val scalaTestVersion = "3.0.8"
+val scalaTestVersion = "3.1.2"
 val specs2Version = "4.10.0"
 val webjarJqueryVersion = "3.3.1"
 val webjarReactVersion = "16.7.0"
diff --git a/modules/client/js/src/test/scala/kartograffel/ClientSpec.scala b/modules/client/js/src/test/scala/kartograffel/ClientSpec.scala
index 1ca12fc..d0eb131 100644
--- a/modules/client/js/src/test/scala/kartograffel/ClientSpec.scala
+++ b/modules/client/js/src/test/scala/kartograffel/ClientSpec.scala
@@ -1,8 +1,8 @@
 package kartograffel
 
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 
-class ClientSpec extends FunSuite {
+class ClientSpec extends AnyFunSuite {
   test("run main") {
     //Client.main(Array.empty)
     true
diff --git a/modules/server/jvm/src/test/scala/kartograffel/server/domain/model/GraffelSpec.scala b/modules/server/jvm/src/test/scala/kartograffel/server/domain/model/GraffelSpec.scala
index dbbd8be..9f6c3e4 100644
--- a/modules/server/jvm/src/test/scala/kartograffel/server/domain/model/GraffelSpec.scala
+++ b/modules/server/jvm/src/test/scala/kartograffel/server/domain/model/GraffelSpec.scala
@@ -2,11 +2,11 @@ package kartograffel.server.domain.model
 
 import io.circe.testing.CodecTests
 import io.circe.testing.instances._
-import org.scalatest.FunSuite
 import org.typelevel.discipline.scalatest.Discipline
 
 import kartograffel.server.ArbitraryInstances._
+import org.scalatest.funsuite.AnyFunSuite
 
-class GraffelSpec extends FunSuite with Discipline {
+class GraffelSpec extends AnyFunSuite with Discipline {
   checkAll("Graffel", CodecTests[Graffel].codec)
 }
diff --git a/modules/server/jvm/src/test/scala/kartograffel/server/domain/model/TagTest.scala b/modules/server/jvm/src/test/scala/kartograffel/server/domain/model/TagTest.scala
index a77b36b..1e90f4b 100644
--- a/modules/server/jvm/src/test/scala/kartograffel/server/domain/model/TagTest.scala
+++ b/modules/server/jvm/src/test/scala/kartograffel/server/domain/model/TagTest.scala
@@ -2,11 +2,11 @@ package kartograffel.server.domain.model
 
 import io.circe.testing.CodecTests
 import io.circe.testing.instances._
-import org.scalatest.FunSuite
 import org.typelevel.discipline.scalatest.Discipline
 
 import kartograffel.server.ArbitraryInstances._
+import org.scalatest.funsuite.AnyFunSuite
 
-class TagTest extends FunSuite with Discipline {
+class TagTest extends AnyFunSuite with Discipline {
   checkAll("Tag", CodecTests[Tag].codec)
 }
diff --git a/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/repository/DbGraffelRepositoryTest.scala b/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/repository/DbGraffelRepositoryTest.scala
index ac55dcd..0793234 100644
--- a/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/repository/DbGraffelRepositoryTest.scala
+++ b/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/repository/DbGraffelRepositoryTest.scala
@@ -1,10 +1,11 @@
 package kartograffel.server.infrastructure.doobie.repository
-import org.scalatest.{FunSuite, Matchers}
 import kartograffel.server.ArbitraryInstances._
 import kartograffel.server.domain.model.Graffel
 import kartograffel.server.infrastructure.doobie.DbSpecification._
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatest.matchers.should.Matchers
 
-class DbGraffelRepositoryTest extends FunSuite with Matchers {
+class DbGraffelRepositoryTest extends AnyFunSuite with Matchers {
   test("findByPosition") {
     val g = sampleOf[Graffel]
 
diff --git a/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/repository/DbTagRepositoryTest.scala b/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/repository/DbTagRepositoryTest.scala
index e074d06..fd6124a 100644
--- a/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/repository/DbTagRepositoryTest.scala
+++ b/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/repository/DbTagRepositoryTest.scala
@@ -4,9 +4,10 @@ import kartograffel.server.ArbitraryInstances._
 import kartograffel.server.domain.model.Radius.LengthRange
 import kartograffel.server.domain.model._
 import kartograffel.server.infrastructure.doobie.DbSpecification._
-import org.scalatest.{FunSuite, Matchers}
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatest.matchers.should.Matchers
 
-class DbTagRepositoryTest extends FunSuite with Matchers {
+class DbTagRepositoryTest extends AnyFunSuite with Matchers {
   test("create") {
     val graffel = sampleOf[Graffel]
     val tag = sampleOf[Tag].copy(graffelId = graffel.id)
diff --git a/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/service/DbGraffelServiceTest.scala b/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/service/DbGraffelServiceTest.scala
index 214fa50..2b70ff9 100644
--- a/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/service/DbGraffelServiceTest.scala
+++ b/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/service/DbGraffelServiceTest.scala
@@ -1,13 +1,14 @@
 package kartograffel.server.infrastructure.doobie.service
 import eu.timepit.refined.refineMV
-import org.scalatest.{FunSuite, Matchers}
 import kartograffel.server.ArbitraryInstances._
 import kartograffel.server.domain.model.Radius.LengthRange
 import kartograffel.server.domain.model.{kilometer, Radius}
 import kartograffel.server.infrastructure.doobie.DbSpecification._
 import kartograffel.shared.domain.model.Position
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatest.matchers.should.Matchers
 
-class DbGraffelServiceTest extends FunSuite with Matchers {
+class DbGraffelServiceTest extends AnyFunSuite with Matchers {
   test("create") {
     val name = sampleOf[String]
     val pos = sampleOf[Position]
diff --git a/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/statements/GraffelStatementsTest.scala b/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/statements/GraffelStatementsTest.scala
index 4723d7c..da0e8c1 100644
--- a/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/statements/GraffelStatementsTest.scala
+++ b/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/statements/GraffelStatementsTest.scala
@@ -1,11 +1,11 @@
 package kartograffel.server.infrastructure.doobie.statements
-import org.scalatest.FunSuite
 import kartograffel.server.infrastructure.doobie.DbSpecification._
 import kartograffel.server.ArbitraryInstances._
 import kartograffel.server.domain.model.{Graffel, GraffelId}
 import kartograffel.shared.domain.model.Position
+import org.scalatest.funsuite.AnyFunSuite
 
-class GraffelStatementsTest extends FunSuite {
+class GraffelStatementsTest extends AnyFunSuite {
   test("create") {
     check(GraffelStatements.create(sampleOf[Graffel]))
   }
diff --git a/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/statements/TagStatementsTest.scala b/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/statements/TagStatementsTest.scala
index 4d054cd..34d7279 100644
--- a/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/statements/TagStatementsTest.scala
+++ b/modules/server/jvm/src/test/scala/kartograffel/server/infrastructure/doobie/statements/TagStatementsTest.scala
@@ -1,11 +1,11 @@
 package kartograffel.server.infrastructure.doobie.statements
-import org.scalatest.FunSuite
 import kartograffel.server.infrastructure.doobie.DbSpecification._
 import kartograffel.server.ArbitraryInstances._
 import kartograffel.server.domain.model.{GraffelId, Radius, Tag}
 import kartograffel.shared.domain.model.Position
+import org.scalatest.funsuite.AnyFunSuite
 
-class TagStatementsTest extends FunSuite {
+class TagStatementsTest extends AnyFunSuite {
   test("find") {
     check(TagStatements.find(sampleOf[String], sampleOf[GraffelId]))
   }
diff --git a/modules/shared/shared/src/test/scala/kartograffel/shared/domain/model/PositionSpec.scala b/modules/shared/shared/src/test/scala/kartograffel/shared/domain/model/PositionSpec.scala
index 2c6c5d8..825053f 100644
--- a/modules/shared/shared/src/test/scala/kartograffel/shared/domain/model/PositionSpec.scala
+++ b/modules/shared/shared/src/test/scala/kartograffel/shared/domain/model/PositionSpec.scala
@@ -2,11 +2,11 @@ package kartograffel.shared.domain.model
 
 import io.circe.testing.CodecTests
 import io.circe.testing.instances._
-import org.scalatest.FunSuite
 import org.typelevel.discipline.scalatest.Discipline
 
 import kartograffel.shared.SharedArbitraryInstances._
+import org.scalatest.funsuite.AnyFunSuite
 
-class PositionSpec extends FunSuite with Discipline {
+class PositionSpec extends AnyFunSuite with Discipline {
   checkAll("Position", CodecTests[Position].codec)
 }
diff --git a/modules/shared/shared/src/test/scala/kartograffel/shared/ui/model/TagViewSpec.scala b/modules/shared/shared/src/test/scala/kartograffel/shared/ui/model/TagViewSpec.scala
index 97552dc..29c3926 100644
--- a/modules/shared/shared/src/test/scala/kartograffel/shared/ui/model/TagViewSpec.scala
+++ b/modules/shared/shared/src/test/scala/kartograffel/shared/ui/model/TagViewSpec.scala
@@ -1,12 +1,12 @@
 package kartograffel.shared.ui.model
 import io.circe.testing.CodecTests
-import org.scalatest.FunSuite
 
 import io.circe.testing.instances._
 import org.typelevel.discipline.scalatest.Discipline
 
 import kartograffel.shared.SharedArbitraryInstances._
+import org.scalatest.funsuite.AnyFunSuite
 
-class TagViewSpec extends FunSuite with Discipline {
+class TagViewSpec extends AnyFunSuite with Discipline {
   checkAll("TagView", CodecTests[TagView].codec)
 }