diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 35ac97c0a9..a9217f5555 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ defaults:
 env:
   BITCOIN_VERSION: "27"
   
-  TRANCHES: 16
+  TRANCHES: 8
 
   # If you change this value, please change it in the following files as well:
   # /.travis.yml
diff --git a/chainntnfs/bitcoindnotify/bitcoind_test.go b/chainntnfs/bitcoindnotify/bitcoind_test.go
index 8d54439a6c..34b93068a7 100644
--- a/chainntnfs/bitcoindnotify/bitcoind_test.go
+++ b/chainntnfs/bitcoindnotify/bitcoind_test.go
@@ -100,7 +100,9 @@ func syncNotifierWithMiner(t *testing.T, notifier *BitcoindNotifier,
 		select {
 		case <-time.After(100 * time.Millisecond):
 		case <-timeout:
-			t.Fatalf("timed out waiting to sync notifier")
+			t.Fatalf("timed out in syncNotifierWithMiner, got "+
+				"err=%v, minerHeight=%v, bitcoindHeight=%v",
+				err, minerHeight, bitcoindHeight)
 		}
 	}
 }
diff --git a/itest/lnd_route_blinding_test.go b/itest/lnd_route_blinding_test.go
index 4b0eef859c..5c32a85a39 100644
--- a/itest/lnd_route_blinding_test.go
+++ b/itest/lnd_route_blinding_test.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/hex"
+	"errors"
 	"time"
 
 	"github.com/btcsuite/btcd/btcec/v2"
@@ -465,6 +466,14 @@ func (b *blindedForwardTest) sendBlindedPayment(ctx context.Context,
 	ctx, cancel := context.WithTimeout(ctx, time.Hour)
 	go func() {
 		_, err := b.ht.Alice.RPC.Router.SendToRouteV2(ctx, sendReq)
+
+		// We may get a context canceled error when the test is
+		// finished.
+		if errors.Is(err, context.Canceled) {
+			b.ht.Logf("sendBlindedPayment: parent context canceled")
+			return
+		}
+
 		require.NoError(b.ht, err)
 	}()
 
diff --git a/lntest/wait/timeouts.go b/lntest/wait/timeouts.go
index 21c99959b3..f8239799b6 100644
--- a/lntest/wait/timeouts.go
+++ b/lntest/wait/timeouts.go
@@ -16,7 +16,7 @@ const (
 
 	// ChannelCloseTimeout is the max time we will wait before a channel is
 	// considered closed.
-	ChannelCloseTimeout = time.Second * 60
+	ChannelCloseTimeout = time.Second * 30
 
 	// DefaultTimeout is a timeout that will be used for various wait
 	// scenarios where no custom timeout value is defined.
diff --git a/lntest/wait/timeouts_darwin.go b/lntest/wait/timeouts_darwin.go
index bc9ff21445..f992d06b22 100644
--- a/lntest/wait/timeouts_darwin.go
+++ b/lntest/wait/timeouts_darwin.go
@@ -16,7 +16,7 @@ const (
 
 	// ChannelCloseTimeout is the max time we will wait before a channel is
 	// considered closed.
-	ChannelCloseTimeout = time.Second * 60
+	ChannelCloseTimeout = time.Second * 30
 
 	// DefaultTimeout is a timeout that will be used for various wait
 	// scenarios where no custom timeout value is defined.
diff --git a/lntest/wait/timeouts_remote_db.go b/lntest/wait/timeouts_remote_db.go
index 470cc3aa8a..43cd6e022b 100644
--- a/lntest/wait/timeouts_remote_db.go
+++ b/lntest/wait/timeouts_remote_db.go
@@ -6,34 +6,39 @@ package wait
 import "time"
 
 const (
+	// extraTimeout is the additional time we wait for the postgres backend
+	// until the issue is resolved:
+	// - https://github.com/lightningnetwork/lnd/issues/8809
+	extraTimeout = time.Second * 30
+
 	// MinerMempoolTimeout is the max time we will wait for a transaction
 	// to propagate to the mining node's mempool.
-	MinerMempoolTimeout = time.Minute
+	MinerMempoolTimeout = time.Minute + extraTimeout
 
 	// ChannelOpenTimeout is the max time we will wait before a channel to
 	// be considered opened.
-	ChannelOpenTimeout = time.Second * 30
+	ChannelOpenTimeout = time.Second*30 + extraTimeout
 
 	// ChannelCloseTimeout is the max time we will wait before a channel is
 	// considered closed.
-	ChannelCloseTimeout = time.Second * 30
+	ChannelCloseTimeout = time.Second*30 + extraTimeout
 
 	// DefaultTimeout is a timeout that will be used for various wait
 	// scenarios where no custom timeout value is defined.
-	DefaultTimeout = time.Second * 60
+	DefaultTimeout = time.Second*60 + extraTimeout
 
 	// AsyncBenchmarkTimeout is the timeout used when running the async
 	// payments benchmark.
-	AsyncBenchmarkTimeout = time.Minute * 2
+	AsyncBenchmarkTimeout = time.Minute*2 + extraTimeout
 
 	// NodeStartTimeout is the timeout value when waiting for a node to
 	// become fully started.
-	NodeStartTimeout = time.Minute * 2
+	NodeStartTimeout = time.Minute*2 + extraTimeout
 
 	// SqliteBusyTimeout is the maximum time that a call to the sqlite db
 	// will wait for the connection to become available.
-	SqliteBusyTimeout = time.Second * 10
+	SqliteBusyTimeout = time.Second*10 + extraTimeout
 
 	// PaymentTimeout is the timeout used when sending payments.
-	PaymentTimeout = time.Second * 60
+	PaymentTimeout = time.Second*60 + extraTimeout
 )