diff --git a/cmd/geth/retesteth.go b/cmd/geth/retesteth.go
index bb77c25ef1..b293b44fd0 100644
--- a/cmd/geth/retesteth.go
+++ b/cmd/geth/retesteth.go
@@ -887,14 +887,12 @@ func retesteth(ctx *cli.Context) error {
 	}
 	vhosts := splitAndTrim(ctx.GlobalString(utils.RPCVirtualHostsFlag.Name))
 	cors := splitAndTrim(ctx.GlobalString(utils.RPCCORSDomainFlag.Name))
-
+	// register apis and create handler stack
 	srv := rpc.NewServer()
-
 	err := node.RegisterApisFromWhitelist(rpcAPI, []string{"test", "eth", "debug", "web3"}, srv, false)
 	if err != nil {
 		utils.Fatalf("Could not register RPC apis: %w", err)
 	}
-
 	handler := node.NewHTTPHandlerStack(srv, cors, vhosts)
 	// start http server
 	var RetestethHTTPTimeouts = rpc.HTTPTimeouts{
diff --git a/node/node.go b/node/node.go
index b60cb9681c..1d14317fc1 100644
--- a/node/node.go
+++ b/node/node.go
@@ -707,7 +707,6 @@ func RegisterApisFromWhitelist(apis []rpc.API, modules []string, srv *rpc.Server
 			if err := srv.RegisterName(api.Namespace, api.Service); err != nil {
 				return err
 			}
-			log.Debug("HTTP registered", "namespace", api.Namespace)
 		}
 	}
 	return nil
diff --git a/node/node_test.go b/node/node_test.go
index 903668f358..73f29a137f 100644
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -615,7 +615,7 @@ func TestWebsocketHTTPOnSamePort_WebsocketRequest(t *testing.T) {
 	wsReq.Header.Set("Sec-Websocket-Key", "SGVsbG8sIHdvcmxkIQ==")
 
 	wsResponses := make(chan *http.Response)
-	go doHTTPRequest(wsResponses, wsReq, t)
+	go doHTTPRequest(t, wsResponses, wsReq)
 	wsResponse := <-wsResponses
 
 	assert.Equal(t, "websocket", wsResponse.Header.Get("Upgrade"))
@@ -632,7 +632,7 @@ func TestWebsocketHTTPOnSamePort_HTTPRequest(t *testing.T) {
 	httpReq.Header.Set("Accept-Encoding", "gzip")
 
 	httpResponses := make(chan *http.Response)
-	go doHTTPRequest(httpResponses, httpReq, t)
+	go doHTTPRequest(t, httpResponses, httpReq)
 	httpResponse := <-httpResponses
 
 	assert.Equal(t, "gzip", httpResponse.Header.Get("Content-Encoding"))
@@ -653,7 +653,7 @@ func startHTTP(t *testing.T) *Node {
 	return node
 }
 
-func doHTTPRequest(responses chan *http.Response, req *http.Request, t *testing.T) {
+func doHTTPRequest(t *testing.T, responses chan *http.Response, req *http.Request) {
 	client := &http.Client{}
 
 	resp, err := client.Do(req)