diff --git a/internal/server/middleware_test.go b/internal/server/middleware_test.go
index a12243345111ab6301a10699c9f84fcaf219559b..e84f14617cb11472f0463e25765b41b873e5b9fb 100644
--- a/internal/server/middleware_test.go
+++ b/internal/server/middleware_test.go
@@ -31,23 +31,24 @@ import (
 	"info-manager-proxy/internal/mock"
 	"net/http"
 	"testing"
-	log "github.com/sirupsen/logrus"
+	"log"
+    "github.com/sirupsen/logrus"
+    "go.elastic.co/ecslogrus"
 )
 
 func TestRequestLoggingMiddleware(t *testing.T) {
+    logger := logrus.New()
+    logger.SetFormatter(&ecslogrus.Formatter{})
+    log.SetOutput(logger.Writer())
+
 	t.Run("should log request", func(t *testing.T) {
+	    logger.SetLevel(logrus.InfoLevel)
 		mock.SetUpGrpcServer()
 		SetUpHttpGateway()
 
 		var buf bytes.Buffer
 		log.SetOutput(&buf)
 
-		originalFlags := log.Baselog.Flags()
-		defer func() {
-			log.SetOutput(nil)
-			log.SetFlags(originalFlags)
-		}()
-
 		http.Get("http://localhost:8082/api/v1/information/testId")
 
 		logOutput := buf.String()
@@ -56,18 +57,13 @@ func TestRequestLoggingMiddleware(t *testing.T) {
 	})
 
 	t.Run("should not log request", func(t *testing.T) {
+	    logger.SetLevel(logrus.InfoLevel)
 		mock.SetUpGrpcServer()
 		SetUpHttpGateway()
 
 		var buf bytes.Buffer
 		log.SetOutput(&buf)
 
-		originalFlags := log.Baselog.Flags()
-		defer func() {
-			log.SetOutput(nil)
-			log.SetFlags(originalFlags)
-		}()
-
 		http.Get("http://localhost:8082/")
 
 		logOutput := buf.String()