diff --git a/config.json b/config.json
index aca0e706..f27041c7 100644
--- a/config.json
+++ b/config.json
@@ -430,6 +430,9 @@
       "slug": "zipper",
       "difficulty": 1,
       "topics": [
+         "Generics",
+         "Optional values",
+         "Trees"
       ]
 		},
     {
diff --git a/exercises/zipper/build.sbt b/exercises/zipper/build.sbt
index 5656a8f7..d023118a 100644
--- a/exercises/zipper/build.sbt
+++ b/exercises/zipper/build.sbt
@@ -1,3 +1,3 @@
-scalaVersion := "2.11.8"
+scalaVersion := "2.12.1"
 
-libraryDependencies += "org.scalatest" % "scalatest_2.11" % "2.2.5" % "test"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"