diff --git a/tests/basicswap/test_btc_xmr.py b/tests/basicswap/test_btc_xmr.py
index 2d80ed2..de4e9f1 100644
--- a/tests/basicswap/test_btc_xmr.py
+++ b/tests/basicswap/test_btc_xmr.py
@@ -116,7 +116,7 @@ class Test(BaseTest):
         rate_swap = make_int(random.uniform(0.2, 20.0), scale=12, r=1)
         offer_id = swap_clients[0].postOffer(
             self.test_coin_from, Coins.XMR, amt_swap, rate_swap, amt_swap, SwapTypes.XMR_SWAP,
-            lock_type=TxLockTypes.SEQUENCE_LOCK_BLOCKS, lock_value=12)
+            lock_type=TxLockTypes.SEQUENCE_LOCK_BLOCKS, lock_value=32)
         wait_for_offer(test_delay_event, swap_clients[1], offer_id)
         offer = swap_clients[1].getOffer(offer_id)
 
@@ -132,7 +132,7 @@ class Test(BaseTest):
         swap_clients[0].acceptXmrBid(bid_id)
 
         wait_for_bid(test_delay_event, swap_clients[0], bid_id, BidStates.XMR_SWAP_FAILED_REFUNDED, wait_for=180)
-        wait_for_bid(test_delay_event, swap_clients[1], bid_id, BidStates.XMR_SWAP_FAILED_REFUNDED, sent=True)
+        wait_for_bid(test_delay_event, swap_clients[1], bid_id, [BidStates.BID_STALLED_FOR_TEST, BidStates.XMR_SWAP_FAILED], sent=True)
 
         js_w0_after = read_json_api(1800, 'wallets')
         node0_from_after = self.getBalance(js_w0_after)
@@ -151,7 +151,7 @@ class Test(BaseTest):
         rate_swap = make_int(random.uniform(0.2, 20.0), scale=12, r=1)
         offer_id = swap_clients[0].postOffer(
             self.test_coin_from, Coins.XMR, amt_swap, rate_swap, amt_swap, SwapTypes.XMR_SWAP,
-            lock_type=TxLockTypes.SEQUENCE_LOCK_BLOCKS, lock_value=12)
+            lock_type=TxLockTypes.SEQUENCE_LOCK_BLOCKS, lock_value=32)
         wait_for_offer(test_delay_event, swap_clients[1], offer_id)
         offer = swap_clients[1].getOffer(offer_id)
 
@@ -178,6 +178,8 @@ class Test(BaseTest):
         # TODO: Discard block rewards
         # assert(node1_from_after - node1_from_before > (amount_from - 0.02))
 
+        swap_clients[0].abandonBid(bid_id)
+
         wait_for_none_active(test_delay_event, 1800)
         wait_for_none_active(test_delay_event, 1801)
 
@@ -193,7 +195,7 @@ class Test(BaseTest):
         rate_swap = make_int(random.uniform(0.2, 20.0), scale=12, r=1)
         offer_id = swap_clients[0].postOffer(
             self.test_coin_from, Coins.XMR, amt_swap, rate_swap, amt_swap, SwapTypes.XMR_SWAP,
-            lock_type=TxLockTypes.SEQUENCE_LOCK_BLOCKS, lock_value=18)
+            lock_type=TxLockTypes.SEQUENCE_LOCK_BLOCKS, lock_value=32)
         wait_for_offer(test_delay_event, swap_clients[1], offer_id)
         offer = swap_clients[1].getOffer(offer_id)
 
diff --git a/tests/basicswap/test_ltc_xmr.py b/tests/basicswap/test_ltc_xmr.py
index 5f48e84..c333726 100644
--- a/tests/basicswap/test_ltc_xmr.py
+++ b/tests/basicswap/test_ltc_xmr.py
@@ -153,7 +153,7 @@ class Test(BaseTest):
         swap_clients[0].acceptXmrBid(bid_id)
 
         wait_for_bid(test_delay_event, swap_clients[0], bid_id, BidStates.XMR_SWAP_FAILED_REFUNDED, wait_for=180)
-        wait_for_bid(test_delay_event, swap_clients[1], bid_id, BidStates.XMR_SWAP_FAILED_REFUNDED, sent=True)
+        wait_for_bid(test_delay_event, swap_clients[1], bid_id, [BidStates.BID_STALLED_FOR_TEST, BidStates.XMR_SWAP_FAILED], sent=True)
 
         js_w0_after = read_json_api(1800, 'wallets')
         node0_from_after = self.getBalance(js_w0_after)
@@ -198,6 +198,8 @@ class Test(BaseTest):
         # TODO: Discard block rewards
         # assert(node1_from_after - node1_from_before > (amount_from - 0.02))
 
+        swap_clients[0].abandonBid(bid_id)
+
         wait_for_none_active(test_delay_event, 1800)
         wait_for_none_active(test_delay_event, 1801)
 
@@ -213,7 +215,7 @@ class Test(BaseTest):
         rate_swap = make_int(random.uniform(0.2, 20.0), scale=12, r=1)
         offer_id = swap_clients[0].postOffer(
             self.test_coin_from, Coins.XMR, amt_swap, rate_swap, amt_swap, SwapTypes.XMR_SWAP,
-            lock_type=TxLockTypes.SEQUENCE_LOCK_BLOCKS, lock_value=18)
+            lock_type=TxLockTypes.SEQUENCE_LOCK_BLOCKS, lock_value=28)
         wait_for_offer(test_delay_event, swap_clients[1], offer_id)
         offer = swap_clients[1].getOffer(offer_id)
 
diff --git a/tests/basicswap/test_partblind_xmr.py b/tests/basicswap/test_partblind_xmr.py
index 96e37dd..3b56f85 100644
--- a/tests/basicswap/test_partblind_xmr.py
+++ b/tests/basicswap/test_partblind_xmr.py
@@ -145,7 +145,7 @@ class Test(BaseTest):
         swap_clients[0].acceptXmrBid(bid_id)
 
         wait_for_bid(test_delay_event, swap_clients[0], bid_id, BidStates.XMR_SWAP_FAILED_REFUNDED, wait_for=180)
-        wait_for_bid(test_delay_event, swap_clients[1], bid_id, BidStates.XMR_SWAP_FAILED_REFUNDED, sent=True)
+        wait_for_bid(test_delay_event, swap_clients[1], bid_id, [BidStates.BID_STALLED_FOR_TEST, BidStates.XMR_SWAP_FAILED], sent=True)
 
         js_w0_after = read_json_api(1800, 'wallets')
         node0_blind_after = self.getBalance(js_w0_after)
@@ -188,6 +188,9 @@ class Test(BaseTest):
         amount_from = float(format_amount(amt_swap, 8))
         assert(node1_blind_after - node1_blind_before > (amount_from - 0.02))
 
+        swap_clients[0].abandonBid(bid_id)
+        swap_clients[1].abandonBid(bid_id)
+
         wait_for_none_active(test_delay_event, 1800)
         wait_for_none_active(test_delay_event, 1801)
 
@@ -215,7 +218,7 @@ class Test(BaseTest):
         rate_swap = make_int(random.uniform(0.2, 20.0), scale=12, r=1)
         offer_id = swap_clients[0].postOffer(
             Coins.PART_BLIND, Coins.XMR, amt_swap, rate_swap, amt_swap, SwapTypes.XMR_SWAP,
-            lock_type=TxLockTypes.SEQUENCE_LOCK_BLOCKS, lock_value=18)
+            lock_type=TxLockTypes.SEQUENCE_LOCK_BLOCKS, lock_value=28)
         wait_for_offer(test_delay_event, swap_clients[1], offer_id)
         offer = swap_clients[1].getOffer(offer_id)
 
diff --git a/tests/basicswap/test_xmr.py b/tests/basicswap/test_xmr.py
index f45b992..bdef860 100644
--- a/tests/basicswap/test_xmr.py
+++ b/tests/basicswap/test_xmr.py
@@ -707,7 +707,7 @@ class Test(BaseTest):
         swap_clients[0].acceptXmrBid(bid_id)
 
         wait_for_bid(test_delay_event, swap_clients[0], bid_id, BidStates.XMR_SWAP_FAILED_REFUNDED, wait_for=180)
-        wait_for_bid(test_delay_event, swap_clients[1], bid_id, [BidStates.BID_STALLED_FOR_TEST, BidStates.XMR_SWAP_FAILED_REFUNDED], sent=True)
+        wait_for_bid(test_delay_event, swap_clients[1], bid_id, [BidStates.BID_STALLED_FOR_TEST, BidStates.XMR_SWAP_FAILED], sent=True)
 
         bid_id_hex = bid_id.hex()
         path = f'bids/{bid_id_hex}/states'