diff --git a/server/router_test.go b/server/router_test.go
index f997f80..8c89eb9 100644
--- a/server/router_test.go
+++ b/server/router_test.go
@@ -12,7 +12,9 @@ import (
 	"github.com/src-d/gitbase-web/server/service"
 	testingTools "github.com/src-d/gitbase-web/server/testing"
 
+	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/suite"
+	log "gopkg.in/src-d/go-log.v1"
 )
 
 func TestRouterTestSuite(t *testing.T) {
@@ -29,11 +31,12 @@ type RouterTestSuite struct {
 const version = "test-version"
 
 func (s *RouterTestSuite) SetupSuite() {
-	logger := service.NewLogger("dev")
+	(&log.LoggerFactory{}).ApplyToLogrus()
+
 	staticHandler := &handler.Static{}
 	s.db = &testingTools.MockDB{}
 	s.router = server.Router(
-		logger,
+		logrus.StandardLogger(),
 		staticHandler,
 		version,
 		s.db,
diff --git a/server/service/logger.go b/server/service/logger.go
deleted file mode 100644
index 6acf507..0000000
--- a/server/service/logger.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package service
-
-import (
-	"github.com/sirupsen/logrus"
-)
-
-// NewLogger returns a logrus Logger
-func NewLogger(env string) *logrus.Logger {
-	logger := logrus.New()
-
-	if env == "dev" {
-		logger.Formatter = &logrus.TextFormatter{
-			FullTimestamp:   true,
-			TimestampFormat: "2006-01-02 15:04:05",
-		}
-		logger.SetLevel(logrus.DebugLevel)
-	} else {
-		logger.Formatter = &logrus.JSONFormatter{
-			FieldMap: logrus.FieldMap{
-				logrus.FieldKeyTime:  "time",
-				logrus.FieldKeyLevel: "severity",
-				logrus.FieldKeyMsg:   "message",
-			},
-		}
-		logger.SetLevel(logrus.InfoLevel)
-	}
-
-	return logger
-}