diff --git a/tests/pydnstest/testserver.py b/tests/pydnstest/testserver.py
index a66b05b20b8a6c65387fee4f3c4e68f6912a4523..f96c5bb39de36f918ebf45b4d768d80ec9fa0cc8 100644
--- a/tests/pydnstest/testserver.py
+++ b/tests/pydnstest/testserver.py
@@ -102,7 +102,11 @@ class TestServer:
                  addr_local = am.local
                  new_entry = False
         if addr_local is None:
-            addr_local = get_local_addr_str(family, iface)
+            # Do not remap addresses already in local range
+            if addr.startswith('127.0.0.') or addr.startswith('::'):
+                addr_local = addr
+            else:
+                addr_local = get_local_addr_str(family, iface)
             am = AddrMapInfo(family,addr_local,addr_external)
             self.addr_map.append(am)
             new_entry = True
diff --git a/tests/testdata/iter_minim_a.rpl b/tests/testdata/iter_minim_a.rpl
index 612c716dc0ea824018609beeb7eac9830b9016cf..f97d445e4f8100a4b99f00fd2ef1ab1d1d252b1e 100644
--- a/tests/testdata/iter_minim_a.rpl
+++ b/tests/testdata/iter_minim_a.rpl
@@ -2,14 +2,14 @@
 	target-fetch-policy: "0 0 0 0 0"
 	query-minimization: on
 	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
+	stub-addr: 127.0.0.10 	# K.ROOT-SERVERS.NET.
 CONFIG_END
 
 SCENARIO_BEGIN Test basic query minimization www.example.com.
 
 ; K.ROOT-SERVERS.NET.
 RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
+	ADDRESS 127.0.0.10
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id
@@ -19,7 +19,7 @@ SECTION QUESTION
 SECTION ANSWER
 . IN NS	K.ROOT-SERVERS.NET.
 SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
+K.ROOT-SERVERS.NET.	IN	A	127.0.0.10
 ENTRY_END
 
 ENTRY_BEGIN