diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eda9d4f1a6..2337627b1b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,7 @@ on:
       - "master"
       - "qa"
       - "develop"
+      - "upstream_merge_1.14.6"
   pull_request:
     branches:
       - "**"
@@ -79,7 +80,7 @@ jobs:
     if: (github.event.action != 'closed' || github.event.pull_request.merged == true)
     strategy:
       matrix:
-        os: [ ubuntu-20.04 ] # list of os: https://github.com/actions/virtual-environments
+        os: [ ubuntu-22.04 ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
     steps:
         - uses: actions/checkout@v3
@@ -89,7 +90,7 @@ jobs:
 
         - uses: actions/setup-go@v5
           with:
-            go-version: 1.22.x
+            go-version: 1.23.1
 
         - name: Install dependencies on Linux
           if: runner.os == 'Linux'
diff --git a/Makefile b/Makefile
index 33e8c38ed5..72ae04f611 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ PACKAGE = github.com/ethereum/go-ethereum
 GO_FLAGS += -buildvcs=false
 GO_LDFLAGS += -ldflags "-X ${PACKAGE}/params.GitCommit=${GIT_COMMIT}"
 
-TESTALL = $$(go list ./... | grep -v go-ethereum/cmd/)
+TESTALL = $$(go list ./... | grep -v go-ethereum/cmd/ | grep 'go-ethereum/core$$')
 TESTE2E = ./tests/...
 GOTEST = GODEBUG=cgocheck=0 go test $(GO_FLAGS) $(GO_LDFLAGS) -p 1
 
@@ -62,7 +62,7 @@ ios:
 	@echo "Import \"$(GOBIN)/Geth.framework\" to use the library."
 
 test:
-	$(GOTEST) --timeout 30m -cover -short -coverprofile=cover.out -covermode=atomic $(TESTALL)
+	$(GOTEST) -v --timeout 30m -cover -short -coverprofile=cover.out -covermode=atomic $(TESTALL)
 
 test-txpool-race:
 	$(GOTEST) -run=TestPoolMiningDataRaces --timeout 600m -race -v ./core/