diff --git a/build.sbt b/build.sbt
index f899455..177efa8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -10,7 +10,7 @@
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.11.6"
+scalaVersion := "2.11.7"
 
 // dependency settings
 resolvers ++= Seq(
@@ -44,8 +44,7 @@
   "javax.servlet"             % "javax.servlet-api"            % "3.1.0"          % "provided",
   "junit"                     % "junit"                        % "4.12"           % "test",
   "org.scalatra"             %% "scalatra-scalatest"           % ScalatraVersion  % "test",
-  "org.scalatra"             %% "scalatra-specs2"              % ScalatraVersion  % "test",
-  "org.specs2"               %% "specs2-junit"                 % "3.6.6"          % "test"
+  "org.scalaz"               %% "scalaz-core"                  % "7.2.0"          % "test"
 )
 
 // Twirl settings
diff --git a/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
index a012c49..4768f73 100644
--- a/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
+++ b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
@@ -2,16 +2,13 @@
 
 import gitbucket.core.util.RepositoryName
 
-//import org.specs2.mutable.Specification
-import org.json4s.jackson.JsonMethods.{pretty, parse}
+import org.json4s.jackson.JsonMethods.parse
 import org.json4s._
-//import org.specs2.matcher._
 import org.scalatest.FunSuite
 
 import java.util.{Calendar, TimeZone, Date}
 
 
-
 class JsonFormatSpec extends FunSuite {
   val date1 = {
     val d = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
diff --git a/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala b/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
index 5af7bee..a74ae67 100644
--- a/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
+++ b/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
@@ -5,15 +5,17 @@
 import gitbucket.core.model.Account
 import gitbucket.core.service.{SystemSettingsService, RequestCache}
 import gitbucket.core.controller.Context
-import org.mockito.Mockito._
 import SystemSettingsService.SystemSettings
 import javax.servlet.http.HttpServletRequest
 import play.twirl.api.Html
 import org.scalatest.FunSpec
+import org.scalatest.mock.MockitoSugar._
+import org.mockito.Mockito._
+
 
 class AvatarImageProviderSpec extends FunSpec {
 
-  val request = mock(classOf[HttpServletRequest])
+  val request = mock[HttpServletRequest]
   when(request.getRequestURL).thenReturn(new StringBuffer("http://localhost:8080/path.html"))
   when(request.getRequestURI).thenReturn("/path.html")
   when(request.getContextPath).thenReturn("")