diff --git a/lntest/wait/timeouts.go b/lntest/wait/timeouts.go
index 21c99959b..f8239799b 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 bc9ff2144..f992d06b2 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 470cc3aa8..43cd6e022 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
 )