diff --git a/authorization_test.go b/authorization_test.go
index c4d115f742c4e77077a3c3102e6ff405e34ae67a..73c7a95fa47227efd39d10cacdd77e9b188b7f6c 100644
--- a/authorization_test.go
+++ b/authorization_test.go
@@ -28,7 +28,7 @@ func runPreAuthorizeHandler(t *testing.T, suffix string, url *regexp.Regexp, api
 	a := &api.API{URL: helper.URLMustParse(ts.URL), Version: "123"}
 
 	response := httptest.NewRecorder()
-	a.PreAuthorizeHandler(okHandler, suffix)(response, httpRequest)
+	a.PreAuthorizeHandler(okHandler, suffix).ServeHTTP(response, httpRequest)
 	helper.AssertResponseCode(t, response, expectedCode)
 	return response
 }
diff --git a/internal/api/api.go b/internal/api/api.go
index 6f613ed9fe2a118a0fac6b4fabf2b3200bf6e764..9107878fe7187c523bfd4fda45c68c303836bbf8 100644
--- a/internal/api/api.go
+++ b/internal/api/api.go
@@ -105,8 +105,8 @@ func (api *API) newRequest(r *http.Request, body io.Reader, suffix string) (*htt
 	return authReq, nil
 }
 
-func (api *API) PreAuthorizeHandler(h HandleFunc, suffix string) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
+func (api *API) PreAuthorizeHandler(h HandleFunc, suffix string) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		authReq, err := api.newRequest(r, nil, suffix)
 		if err != nil {
 			helper.Fail500(w, fmt.Errorf("preAuthorizeHandler: newUpstreamRequest: %v", err))
@@ -160,5 +160,5 @@ func (api *API) PreAuthorizeHandler(h HandleFunc, suffix string) http.HandlerFun
 		}
 
 		h(w, r, a)
-	}
+	})
 }
diff --git a/internal/git/git-http.go b/internal/git/git-http.go
index 326e20194ca9ba765fad77bfd7ae70e82a503c25..47029fda4d7414420fea252e104ed6ddab8b6406 100644
--- a/internal/git/git-http.go
+++ b/internal/git/git-http.go
@@ -36,7 +36,7 @@ func looksLikeRepo(p string) bool {
 	return true
 }
 
-func repoPreAuthorizeHandler(myAPI *api.API, handleFunc api.HandleFunc) http.HandlerFunc {
+func repoPreAuthorizeHandler(myAPI *api.API, handleFunc api.HandleFunc) http.Handler {
 	return myAPI.PreAuthorizeHandler(func(w http.ResponseWriter, r *http.Request, a *api.Response) {
 		if a.RepoPath == "" {
 			helper.Fail500(w, errors.New("repoPreAuthorizeHandler: RepoPath empty"))
diff --git a/internal/lfs/lfs.go b/internal/lfs/lfs.go
index 4ca7253f78da73100525ff22c40ff9d0035403dc..dd86795a53e515338b4e7647701675b3d74f2d25 100644
--- a/internal/lfs/lfs.go
+++ b/internal/lfs/lfs.go
@@ -20,11 +20,11 @@ import (
 	"path/filepath"
 )
 
-func PutStore(a *api.API, p *proxy.Proxy) http.HandlerFunc {
+func PutStore(a *api.API, p *proxy.Proxy) http.Handler {
 	return lfsAuthorizeHandler(a, handleStoreLfsObject(p))
 }
 
-func lfsAuthorizeHandler(myAPI *api.API, handleFunc api.HandleFunc) http.HandlerFunc {
+func lfsAuthorizeHandler(myAPI *api.API, handleFunc api.HandleFunc) http.Handler {
 	return myAPI.PreAuthorizeHandler(func(w http.ResponseWriter, r *http.Request, a *api.Response) {
 
 		if a.StoreLFSPath == "" {
diff --git a/internal/upload/uploads.go b/internal/upload/uploads.go
index a33528530d2f008cbd17102e2712e6fb0b55817b..9fe8e33b24ca7d08de9b58e9efb2b033b40cdee4 100644
--- a/internal/upload/uploads.go
+++ b/internal/upload/uploads.go
@@ -86,8 +86,8 @@ func rewriteFormFilesFromMultipart(r *http.Request, writer *multipart.Writer, te
 	return cleanup, nil
 }
 
-func handleFileUploads(h http.Handler) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
+func handleFileUploads(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		tempPath := r.Header.Get(tempPathHeader)
 		if tempPath == "" {
 			helper.Fail500(w, errors.New("handleFileUploads: TempPath empty"))
@@ -124,5 +124,5 @@ func handleFileUploads(h http.Handler) http.HandlerFunc {
 
 		// Proxy the request
 		h.ServeHTTP(w, r)
-	}
+	})
 }
diff --git a/internal/upstream/handlers.go b/internal/upstream/handlers.go
index d42da447bceefb83bd9dee447dd55680d267caf3..d1a96cec2bf12e46aedee189bf35f765716b6d6c 100644
--- a/internal/upstream/handlers.go
+++ b/internal/upstream/handlers.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 )
 
-func contentEncodingHandler(h http.Handler) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
+func contentEncodingHandler(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		var body io.ReadCloser
 		var err error
 
@@ -34,5 +34,5 @@ func contentEncodingHandler(h http.Handler) http.HandlerFunc {
 		r.Header.Del("Content-Encoding")
 
 		h.ServeHTTP(w, r)
-	}
+	})
 }
diff --git a/internal/upstream/handlers_test.go b/internal/upstream/handlers_test.go
index 23d0afb161d20da9fbbfc8ef8f4e192e3412496e..442b61bb66cd13e5af7c2d2fc6efa2096de8ee94 100644
--- a/internal/upstream/handlers_test.go
+++ b/internal/upstream/handlers_test.go
@@ -35,7 +35,7 @@ func TestGzipEncoding(t *testing.T) {
 		if r.Header.Get("Content-Encoding") != "" {
 			t.Fatal("Content-Encoding should be deleted")
 		}
-	}))(resp, req)
+	})).ServeHTTP(resp, req)
 
 	helper.AssertResponseCode(t, resp, 200)
 }
@@ -59,7 +59,7 @@ func TestNoEncoding(t *testing.T) {
 		if r.Header.Get("Content-Encoding") != "" {
 			t.Fatal("Content-Encoding should be deleted")
 		}
-	}))(resp, req)
+	})).ServeHTTP(resp, req)
 
 	helper.AssertResponseCode(t, resp, 200)
 }
@@ -75,7 +75,7 @@ func TestInvalidEncoding(t *testing.T) {
 
 	contentEncodingHandler(http.HandlerFunc(func(_ http.ResponseWriter, _ *http.Request) {
 		t.Fatal("it shouldn't be executed")
-	}))(resp, req)
+	})).ServeHTTP(resp, req)
 
 	helper.AssertResponseCode(t, resp, 500)
 }