diff --git a/rs-matter/tests/commissioning.rs b/rs-matter/tests/commissioning.rs
index 61239781..73aad8fb 100644
--- a/rs-matter/tests/commissioning.rs
+++ b/rs-matter/tests/commissioning.rs
@@ -338,18 +338,18 @@ async fn discover_and_resolve_device(timeout_ms: u32, use_tcp: bool) -> Result<A
 
 #[cfg(feature = "astro-dnssd")]
 async fn discover_device<const A: usize>(
-    discriminator: u16,
+    filter: &CommissionableFilter,
     timeout_ms: u32,
 ) -> Result<DiscoveredDevice<A>, Error> {
     use rs_matter::transport::network::mdns::astro;
 
+    let filter_owned = filter.clone();
     let (tx, rx) = async_channel::bounded(1);
     std::thread::spawn(move || {
-        let filter = CommissionableFilter {
-            discriminator: Some(discriminator),
-            ..Default::default()
-        };
-        let _ = tx.send_blocking(astro::discover_commissionable::<A>(&filter, timeout_ms));
+        let _ = tx.send_blocking(astro::discover_commissionable::<A>(
+            &filter_owned,
+            timeout_ms,
+        ));
     });
 
     let devices = rx
@@ -358,7 +358,10 @@ async fn discover_device<const A: usize>(
         .map_err(|_| Error::from(rs_matter::error::ErrorCode::Failure))??;
 
     devices.into_iter().next().ok_or_else(|| {
-        warn!("No devices found matching discriminator {discriminator}");
+        warn!(
+            "No devices found matching discriminator {:?}",
+            filter.discriminator
+        );
         rs_matter::error::ErrorCode::NotFound.into()
     })
 }
diff --git a/rs-matter/tests/common/mdns.rs b/rs-matter/tests/common/mdns.rs
index f46d4cf7..0e669896 100644
--- a/rs-matter/tests/common/mdns.rs
+++ b/rs-matter/tests/common/mdns.rs
@@ -32,8 +32,8 @@ use rs_matter::{crypto::Crypto, error::Error};
 #[allow(unused)]
 pub async fn run_mdns<C: Crypto>(matter: &Matter<'_>, crypto: C) -> Result<(), Error> {
     #[cfg(feature = "astro-dnssd")]
-    rs_matter::transport::network::mdns::astro::AstroMdnsResponder::new(matter)
-        .run()
+    rs_matter::transport::network::mdns::astro::AstroMdnsResponder::new()
+        .run(matter)
         .await?;
 
     #[cfg(all(feature = "zeroconf", not(feature = "astro-dnssd")))]