diff --git a/benchmarks/build.sbt b/benchmarks/build.sbt
deleted file mode 100644
index c0faccf4f..000000000
--- a/benchmarks/build.sbt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-import pl.project13.scala.sbt.JmhPlugin
-
-sourceDirectory in Jmh := (sourceDirectory in Test).value
-
-classDirectory in Jmh := (classDirectory in Test).value
-
-dependencyClasspath in Jmh := (dependencyClasspath in Test).value
-
-// rewire tasks, so that 'jmh:run' automatically invokes 'jmh:compile' (otherwise a clean 'jmh:run' would fail)
-compile in Jmh := (compile in Jmh).dependsOn(compile in Test).value
-
-run in Jmh := (run in Jmh).dependsOn(Keys.compile in Jmh).value
diff --git a/benchmarks/src/test/scala/play/api/libs/json/Employee.scala b/benchmarks/src/main/scala/play/api/libs/json/Employee.scala
similarity index 100%
rename from benchmarks/src/test/scala/play/api/libs/json/Employee.scala
rename to benchmarks/src/main/scala/play/api/libs/json/Employee.scala
diff --git a/benchmarks/src/test/scala/play/api/libs/json/JsonMacros_01_SerializeSimpleCaseClass.scala b/benchmarks/src/main/scala/play/api/libs/json/JsonMacros_01_SerializeSimpleCaseClass.scala
similarity index 100%
rename from benchmarks/src/test/scala/play/api/libs/json/JsonMacros_01_SerializeSimpleCaseClass.scala
rename to benchmarks/src/main/scala/play/api/libs/json/JsonMacros_01_SerializeSimpleCaseClass.scala
diff --git a/benchmarks/src/test/scala/play/api/libs/json/JsonMacros_02_SerializeList.scala b/benchmarks/src/main/scala/play/api/libs/json/JsonMacros_02_SerializeList.scala
similarity index 100%
rename from benchmarks/src/test/scala/play/api/libs/json/JsonMacros_02_SerializeList.scala
rename to benchmarks/src/main/scala/play/api/libs/json/JsonMacros_02_SerializeList.scala
diff --git a/build.sbt b/build.sbt
index f31f8533a..ddf0455f9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -207,7 +207,6 @@ lazy val `play-functional` = crossProject.crossType(CrossType.Pure)
 lazy val `play-functionalJVM` = `play-functional`.jvm
 lazy val `play-functionalJS` = `play-functional`.js
 
-import pl.project13.scala.sbt.JmhPlugin
 lazy val benchmarks = project
   .in(file("benchmarks"))
   .enablePlugins(JmhPlugin, PlayNoPublish)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 88ca4ece6..0b945b4a3 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -7,7 +7,7 @@ resolvers += Resolver.typesafeRepo("releases")
 
 addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.get("interplay.version").getOrElse("1.3.7"))
 
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.2")
 
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")