diff --git a/build_msvc/test_bitcoin/test_bitcoin.vcxproj b/build_msvc/test_bitcoin/test_bitcoin.vcxproj
index b6fa8bb7bc..bbff63f78d 100644
--- a/build_msvc/test_bitcoin/test_bitcoin.vcxproj
+++ b/build_msvc/test_bitcoin/test_bitcoin.vcxproj
@@ -20,8 +20,7 @@
     <ClCompile Include="..\..\src\wallet\test\db_tests.cpp" />
     <ClCompile Include="..\..\src\wallet\test\init_tests.cpp" />
     <ClCompile Include="..\..\src\wallet\test\ismine_tests.cpp" />
-    <!-- Exclude psbt_wallet_tests.cpp from the build -->
-    <!-- <ClCompile Include="..\..\src\wallet\test\psbt_wallet_tests.cpp" /> -->
+    <ClCompile Include="..\..\src\wallet\test\psbt_wallet_tests.cpp" />
     <ClCompile Include="..\..\src\wallet\test\scriptpubkeyman_tests.cpp" />
     <ClCompile Include="..\..\src\wallet\test\spend_tests.cpp" />
     <ClCompile Include="..\..\src\wallet\test\wallet_crypto_tests.cpp" />
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index e29531c758..cc97bd332d 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -198,9 +198,8 @@ BITCOIN_TESTS += \
   wallet/test/rpc_util_tests.cpp \
   wallet/test/scriptpubkeyman_tests.cpp \
   wallet/test/walletload_tests.cpp \
-  wallet/test/group_outputs_tests.cpp
-# ELEMENTS: disable PSBT test
-#  wallet/test/psbt_wallet_tests.cpp
+  wallet/test/group_outputs_tests.cpp \
+  wallet/test/psbt_wallet_tests.cpp
 
 FUZZ_SUITE_LD_COMMON +=\
  $(SQLITE_LIBS) \
diff --git a/src/wallet/test/psbt_wallet_tests.cpp b/src/wallet/test/psbt_wallet_tests.cpp
index 583bfd2294..c31c86fc0b 100644
--- a/src/wallet/test/psbt_wallet_tests.cpp
+++ b/src/wallet/test/psbt_wallet_tests.cpp
@@ -54,22 +54,21 @@ BOOST_AUTO_TEST_CASE(psbt_updater_test)
 
     PartiallySignedTransaction psbtx;
     DataStream ssData{
-        ParseHex("70736274ff01009a020000000258e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd750000000000ffffffff838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d0100000000ffffffff0270aaf00800000000160014d85c2b71d0060b09c9886aeb815e50991dda124d00e1f5050000000016001400aea9a2e5f0f876a588df5546e8742d1d87008f000000000000000000"),
+        ParseHex("70736574ff0102040200000001030400000000010401020105010201fb04020000000001070001080100010e2058e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd75010f0400000000011004ffffffff0001070001080100010e20838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d010f0401000000011004ffffffff0001030870aaf0080000000007fc047073657402206d521c38ec1ea15734ae22b7c46064412829c0d0579f0a713d1c04ede979026f0104160014d85c2b71d0060b09c9886aeb815e50991dda124d0001030800e1f5050000000007fc047073657402206d521c38ec1ea15734ae22b7c46064412829c0d0579f0a713d1c04ede979026f010416001400aea9a2e5f0f876a588df5546e8742d1d87008f00"),
     };
     ssData >> psbtx;
 
     // Fill transaction with our data
     BOOST_REQUIRE(!m_wallet.FillPSBTData(psbtx, true));
 
-    // Get the final tx
+    // Get the final tx (pset)
     DataStream ssTx{};
     ssTx << psbtx;
     std::string final_hex = HexStr(ssTx);
-    BOOST_CHECK_EQUAL(final_hex, "70736274ff01009a020000000258e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd750000000000ffffffff838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d0100000000ffffffff0270aaf00800000000160014d85c2b71d0060b09c9886aeb815e50991dda124d00e1f5050000000016001400aea9a2e5f0f876a588df5546e8742d1d87008f00000000000100bb0200000001aad73931018bd25f84ae400b68848be09db706eac2ac18298babee71ab656f8b0000000048473044022058f6fc7c6a33e1b31548d481c826c015bd30135aad42cd67790dab66d2ad243b02204a1ced2604c6735b6393e5b41691dd78b00f0c5942fb9f751856faa938157dba01feffffff0280f0fa020000000017a9140fb9463421696b82c833af241c78c17ddbde493487d0f20a270100000017a91429ca74f8a08f81999428185c97b5d852e4063f6187650000000104475221029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f2102dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d752ae2206029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f10d90c6a4f000000800000008000000080220602dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d710d90c6a4f00000080000000800100008001090880f0fa02000000000001012000c2eb0b0000000017a914b7f5faf40e3d40a5a459b1db3535f2b72fa921e88701042200208c2353173743b595dfb4a07b72ba8e42e3797da74e87fe7d9d7497e3b2028903010547522103089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc21023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7352ae2206023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7310d90c6a4f000000800000008003000080220603089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc10d90c6a4f00000080000000800200008001090800c2eb0b0000000000220203a9a4c37f5996d3aa25dbac6b570af0650394492942460b354753ed9eeca5877110d90c6a4f000000800000008004000080010521010000000000000000000000000000000000000000000000000000000000000000002202027f6399757d2eff55a136ad02c684b1838b6556e5f1b6b34282a94b6b5005109610d90c6a4f00000080000000800500008001052101000000000000000000000000000000000000000000000000000000000000000000");
+    BOOST_CHECK_EQUAL(final_hex, "70736574ff0102040200000001030400000000010401020105010201fb0402000000000100bb0200000001aad73931018bd25f84ae400b68848be09db706eac2ac18298babee71ab656f8b0000000048473044022058f6fc7c6a33e1b31548d481c826c015bd30135aad42cd67790dab66d2ad243b02204a1ced2604c6735b6393e5b41691dd78b00f0c5942fb9f751856faa938157dba01feffffff0280f0fa020000000017a9140fb9463421696b82c833af241c78c17ddbde493487d0f20a270100000017a91429ca74f8a08f81999428185c97b5d852e4063f6187650000000104475221029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f2102dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d752ae2206029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f10d90c6a4f000000800000008000000080220602dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d710d90c6a4f000000800000008001000080010e2058e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd75010f0400000000011004ffffffff0001008a020000000158e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd7501000000171600145f275f436b09a8cc9a2eb2a2f528485c68a56323feffffff02d8231f1b0100000017a914aed962d6654f9a2b36608eb9d64d2b260db4f1118700c2eb0b0000000017a914b7f5faf40e3d40a5a459b1db3535f2b72fa921e8876500000001012000c2eb0b0000000017a914b7f5faf40e3d40a5a459b1db3535f2b72fa921e88701042200208c2353173743b595dfb4a07b72ba8e42e3797da74e87fe7d9d7497e3b2028903010547522103089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc21023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7352ae2206023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7310d90c6a4f000000800000008003000080220603089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc10d90c6a4f000000800000008002000080010e20838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d010f0401000000011004ffffffff0001030870aaf008000000000104160014d85c2b71d0060b09c9886aeb815e50991dda124d07fc047073657402206d521c38ec1ea15734ae22b7c46064412829c0d0579f0a713d1c04ede979026f07fc047073657403210100000000000000000000000000000000000000000000000000000000000000000001030800e1f50500000000010416001400aea9a2e5f0f876a588df5546e8742d1d87008f07fc047073657402206d521c38ec1ea15734ae22b7c46064412829c0d0579f0a713d1c04ede979026f07fc0470736574032101000000000000000000000000000000000000000000000000000000000000000000");
 
     // Mutate the transaction so that one of the inputs is invalid
-    // psbtx.inputs[0].prevout.n = 2; // ELEMENTS: FIXME
-
+    psbtx.inputs[0].prev_out = std::optional<uint32_t>(2u);
     // Try to sign the mutated input
     SignatureData sigdata;
     bool complete = true;