diff --git a/tests/bdk_integration_test.rs b/tests/bdk_integration_test.rs
index 2eb4d02..9b199d4 100644
--- a/tests/bdk_integration_test.rs
+++ b/tests/bdk_integration_test.rs
@@ -278,10 +278,6 @@ fn handle_proposal(proposal: UncheckedProposal, receiver: Wallet) -> Arc<Payjoin
         .contribute_witness_input(txo_to_contribute, outpoint_to_contribute)
         .expect("contribute_witness_input error");
 
-    let receiver_substitute_address = receiver.get_address(AddressIndex::New).to_string();
-    payjoin
-        .substitute_output_address(receiver_substitute_address)
-        .expect("substitute_output_address error");
     let payjoin_proposal = payjoin
         .finalize_proposal(
             |e| {
@@ -355,7 +351,7 @@ mod v1 {
         let psbt = build_original_psbt(&sender, &pj_uri)?;
         println!("\nOriginal sender psbt: {:#?}", psbt.to_string());
 
-        let req_ctx = RequestBuilder::from_psbt_and_uri(psbt.to_string(), Arc::new(pj_uri))?
+        let req_ctx = RequestBuilder::from_psbt_and_uri(psbt.to_string(), Arc::new(pj_uri.check_pj_supported().unwrap()))?
             .build_with_additional_fee(10000, None, 0, false)?
             .extract_v1()?;
         let headers = Headers::from_vec(req_ctx.request.body.clone());
diff --git a/tests/bitcoin_core_integration.rs b/tests/bitcoin_core_integration.rs
index 4543f87..3f3d8cf 100644
--- a/tests/bitcoin_core_integration.rs
+++ b/tests/bitcoin_core_integration.rs
@@ -28,8 +28,9 @@ fn v1_to_v1_full_cycle() -> Result<(), BoxError> {
         pj_receiver_address.to_string(),
         Url::from_str("https://example.com".to_string())?,
         None,
+        None,
     )?
-    .amount(0.0083285)
+    .amount(832_850)
     .build()
     .as_string();
     print!("pj_uri {}", pj_uri_string);
@@ -60,7 +61,7 @@ fn v1_to_v1_full_cycle() -> Result<(), BoxError> {
         .psbt;
     let psbt_base64 = sender.wallet_process_psbt(&psbt, None, None, None)?.psbt;
     eprintln!("Original psbt: {:#?}", psbt_base64);
-    let req_ctx = RequestBuilder::from_psbt_and_uri(psbt_base64, Arc::new(pj_uri))?
+    let req_ctx = RequestBuilder::from_psbt_and_uri(psbt_base64, Arc::new(pj_uri.check_pj_supported().unwrap()))?
         .build_with_additional_fee(10000, None, 0, false)?
         .extract_v1()?;
     let req = req_ctx.request;
@@ -175,9 +176,6 @@ fn handle_pj_proposal(proposal: UncheckedProposal, receiver: Arc<Client>) -> Arc
         .contribute_witness_input(txo_to_contribute, outpoint_to_contribute)
         .expect("contribute_witness_input error");
 
-    let receiver_substitute_address =
-        receiver.get_new_address(None, None).unwrap().assume_checked();
-    payjoin.substitute_output_address(receiver_substitute_address.to_string()).unwrap();
     let payjoin_proposal = payjoin
         .finalize_proposal(
             |e| {