diff --git a/lnwallet/channel_test.go b/lnwallet/channel_test.go
index 4b517a00..7732e372 100644
--- a/lnwallet/channel_test.go
+++ b/lnwallet/channel_test.go
@@ -292,8 +292,12 @@ func createTestChannels(revocationWindow int) (*LightningChannel, *LightningChan
 		return nil, nil, nil, err
 	}
 
-	estimator := &StaticFeeEstimator{24, 6}
-	feePerKw := btcutil.Amount(estimator.EstimateFeePerWeight(1) * 1000)
+	estimator := &StaticFeeEstimator{24}
+	feePerWeight, err := estimator.EstimateFeePerWeight(1)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	feePerKw := feePerWeight * 1000
 	commitFee := calcStaticFee(0)
 
 	aliceCommit := channeldb.ChannelCommitment{
@@ -797,8 +801,8 @@ func TestCooperativeChannelClosure(t *testing.T) {
 
 	// We'll store with both Alice and Bob creating a new close proposal
 	// with the same fee.
-	aliceFee := aliceChannel.CalcFee(aliceFeeRate)
-	aliceSig, _, err := aliceChannel.CreateCloseProposal(
+	aliceFee := btcutil.Amount(aliceChannel.CalcFee(aliceFeeRate))
+	aliceSig, err := aliceChannel.CreateCloseProposal(
 		aliceFee, aliceDeliveryScript, bobDeliveryScript,
 	)
 	if err != nil {
@@ -806,8 +810,8 @@ func TestCooperativeChannelClosure(t *testing.T) {
 	}
 	aliceCloseSig := append(aliceSig, byte(txscript.SigHashAll))
 
-	bobFee := bobChannel.CalcFee(bobFeeRate)
-	bobSig, _, err := bobChannel.CreateCloseProposal(
+	bobFee := btcutil.Amount(bobChannel.CalcFee(bobFeeRate))
+	bobSig, err := bobChannel.CreateCloseProposal(
 		bobFee, bobDeliveryScript, aliceDeliveryScript,
 	)
 	if err != nil {
@@ -1803,16 +1807,16 @@ func TestCooperativeCloseDustAdherence(t *testing.T) {
 	// Both sides currently have over 1 BTC settled as part of their
 	// balances. As a result, performing a cooperative closure now result
 	// in both sides having an output within the closure transaction.
-	aliceFee := aliceChannel.CalcFee(aliceFeeRate)
-	aliceSig, _, err := aliceChannel.CreateCloseProposal(aliceFee,
+	aliceFee := btcutil.Amount(aliceChannel.CalcFee(aliceFeeRate))
+	aliceSig, err := aliceChannel.CreateCloseProposal(aliceFee,
 		aliceDeliveryScript, bobDeliveryScript)
 	if err != nil {
 		t.Fatalf("unable to close channel: %v", err)
 	}
 	aliceCloseSig := append(aliceSig, byte(txscript.SigHashAll))
 
-	bobFee := bobChannel.CalcFee(bobFeeRate)
-	bobSig, _, err := bobChannel.CreateCloseProposal(bobFee,
+	bobFee := btcutil.Amount(bobChannel.CalcFee(bobFeeRate))
+	bobSig, err := bobChannel.CreateCloseProposal(bobFee,
 		bobDeliveryScript, aliceDeliveryScript)
 	if err != nil {
 		t.Fatalf("unable to close channel: %v", err)
@@ -1843,14 +1847,14 @@ func TestCooperativeCloseDustAdherence(t *testing.T) {
 
 	// Attempt another cooperative channel closure. It should succeed
 	// without any issues.
-	aliceSig, _, err = aliceChannel.CreateCloseProposal(aliceFee,
+	aliceSig, err = aliceChannel.CreateCloseProposal(aliceFee,
 		aliceDeliveryScript, bobDeliveryScript)
 	if err != nil {
 		t.Fatalf("unable to close channel: %v", err)
 	}
 	aliceCloseSig = append(aliceSig, byte(txscript.SigHashAll))
 
-	bobSig, _, err = bobChannel.CreateCloseProposal(bobFee,
+	bobSig, err = bobChannel.CreateCloseProposal(bobFee,
 		bobDeliveryScript, aliceDeliveryScript)
 	if err != nil {
 		t.Fatalf("unable to close channel: %v", err)
@@ -1883,14 +1887,14 @@ func TestCooperativeCloseDustAdherence(t *testing.T) {
 
 	// Our final attempt at another cooperative channel closure. It should
 	// succeed without any issues.
-	aliceSig, _, err = aliceChannel.CreateCloseProposal(aliceFee,
+	aliceSig, err = aliceChannel.CreateCloseProposal(aliceFee,
 		aliceDeliveryScript, bobDeliveryScript)
 	if err != nil {
 		t.Fatalf("unable to close channel: %v", err)
 	}
 	aliceCloseSig = append(aliceSig, byte(txscript.SigHashAll))
 
-	bobSig, _, err = bobChannel.CreateCloseProposal(bobFee,
+	bobSig, err = bobChannel.CreateCloseProposal(bobFee,
 		bobDeliveryScript, aliceDeliveryScript)
 	if err != nil {
 		t.Fatalf("unable to close channel: %v", err)