diff --git a/channeldb/channel_test.go b/channeldb/channel_test.go
index 9840ba00b..ccb6b10a8 100644
--- a/channeldb/channel_test.go
+++ b/channeldb/channel_test.go
@@ -6,6 +6,7 @@ import (
 	"net"
 	"reflect"
 	"runtime"
+	"sync/atomic"
 	"testing"
 
 	"github.com/btcsuite/btcd/btcec/v2"
@@ -64,6 +65,11 @@ var (
 	// dummyRemoteOutIndex specifics a default value for their output index
 	// in this test.
 	dummyRemoteOutIndex = uint32(1)
+
+	// uniqueOutputIndex is used to create a unique funding outpoint.
+	//
+	// NOTE: must be incremented when used.
+	uniqueOutputIndex = atomic.Uint32{}
 )
 
 // testChannelParams is a struct which details the specifics of how a channel
@@ -299,10 +305,15 @@ func createTestChannelState(t *testing.T, cdb *ChannelStateDB) *OpenChannel {
 
 	chanID := lnwire.NewShortChanIDFromInt(uint64(rand.Int63()))
 
+	// Increment the uniqueOutputIndex so we always get a unique value for
+	// the funding outpoint.
+	uniqueOutputIndex.Add(1)
+	op := wire.OutPoint{Hash: key, Index: uniqueOutputIndex.Load()}
+
 	return &OpenChannel{
 		ChanType:          SingleFunderBit | FrozenBit,
 		ChainHash:         key,
-		FundingOutpoint:   wire.OutPoint{Hash: key, Index: rand.Uint32()},
+		FundingOutpoint:   op,
 		ShortChannelID:    chanID,
 		IsInitiator:       true,
 		IsPending:         true,
diff --git a/channeldb/db_test.go b/channeldb/db_test.go
index e2cad1fd1..bed9c6e32 100644
--- a/channeldb/db_test.go
+++ b/channeldb/db_test.go
@@ -243,11 +243,13 @@ func TestFetchChannel(t *testing.T) {
 			spew.Sdump(channelState), spew.Sdump(dbChannel))
 	}
 
-	// If we attempt to query for a non-exist ante channel, then we should
+	// If we attempt to query for a non-existent channel, then we should
 	// get an error.
 	channelState2 := createTestChannelState(t, cdb)
 	require.NoError(t, err, "unable to create channel state")
-	channelState2.FundingOutpoint.Index ^= 1
+
+	uniqueOutputIndex.Add(1)
+	channelState2.FundingOutpoint.Index = uniqueOutputIndex.Load()
 
 	_, err = cdb.FetchChannel(nil, channelState2.FundingOutpoint)
 	if err == nil {