diff --git a/conformance/packages/dns-test/src/name_server.rs b/conformance/packages/dns-test/src/name_server.rs
index 4db1c0c3..2ee6aeb2 100644
--- a/conformance/packages/dns-test/src/name_server.rs
+++ b/conformance/packages/dns-test/src/name_server.rs
@@ -317,8 +317,10 @@ fn zone_file_path() -> String {
 }
 
 fn ns_count() -> usize {
-    static COUNT: AtomicUsize = AtomicUsize::new(0);
-    COUNT.fetch_add(1, atomic::Ordering::Relaxed)
+    thread_local! {
+        static COUNT: AtomicUsize = const { AtomicUsize::new(0) };
+    }
+    COUNT.with(|count| count.fetch_add(1, atomic::Ordering::Relaxed))
 }
 
 impl NameServer<Signed> {