diff --git a/cardano-api/test/cardano-api-test/Test/Cardano/Api/Bech32.hs b/cardano-api/test/cardano-api-test/Test/Cardano/Api/Bech32.hs
index 0627c9dccd..a07e78021b 100644
--- a/cardano-api/test/cardano-api-test/Test/Cardano/Api/Bech32.hs
+++ b/cardano-api/test/cardano-api-test/Test/Cardano/Api/Bech32.hs
@@ -3,7 +3,7 @@ module Test.Cardano.Api.Bech32
   )
 where
 
-import           Cardano.Api (AsType (AsShelleyAddress, AsStakeAddress))
+import           Cardano.Api (AsType (AsAddress, AsShelleyAddr, AsStakeAddress))
 
 import           Test.Gen.Cardano.Api.Typed (genAddressShelley, genStakeAddress)
 
@@ -13,7 +13,7 @@ import           Test.Tasty (TestTree, testGroup)
 import           Test.Tasty.Hedgehog (testProperty)
 
 prop_roundtrip_Address_Shelley :: Property
-prop_roundtrip_Address_Shelley = roundtrip_Bech32 AsShelleyAddress genAddressShelley
+prop_roundtrip_Address_Shelley = roundtrip_Bech32 (AsAddress AsShelleyAddr) genAddressShelley
 
 prop_roundtrip_StakeAddress :: Property
 prop_roundtrip_StakeAddress = roundtrip_Bech32 AsStakeAddress genStakeAddress
diff --git a/cardano-api/test/cardano-api-test/Test/Cardano/Api/RawBytes.hs b/cardano-api/test/cardano-api-test/Test/Cardano/Api/RawBytes.hs
index 3ca4b8f10b..2e8fa7c534 100644
--- a/cardano-api/test/cardano-api-test/Test/Cardano/Api/RawBytes.hs
+++ b/cardano-api/test/cardano-api-test/Test/Cardano/Api/RawBytes.hs
@@ -23,11 +23,11 @@ import           Test.Tasty.Hedgehog (testProperty)
 
 prop_roundtrip_shelley_address_raw :: Property
 prop_roundtrip_shelley_address_raw =
-  roundtrip_raw_bytes AsShelleyAddress genAddressShelley
+  roundtrip_raw_bytes (AsAddress AsShelleyAddr) genAddressShelley
 
 prop_roundtrip_byron_address_raw :: Property
 prop_roundtrip_byron_address_raw =
-  roundtrip_raw_bytes AsByronAddress genAddressByron
+  roundtrip_raw_bytes (AsAddress AsByronAddr) genAddressByron
 
 prop_roundtrip_stake_address_raw :: Property
 prop_roundtrip_stake_address_raw =