diff --git a/tests/junit-functional/org/jgroups/protocols/dns/DefaultDNSResolverTest.java b/tests/junit-functional/org/jgroups/protocols/dns/AddressedDNSResolverTest.java
similarity index 91%
rename from tests/junit-functional/org/jgroups/protocols/dns/DefaultDNSResolverTest.java
rename to tests/junit-functional/org/jgroups/protocols/dns/AddressedDNSResolverTest.java
index 7d729be2938..0f7b732bbc9 100644
--- a/tests/junit-functional/org/jgroups/protocols/dns/DefaultDNSResolverTest.java
+++ b/tests/junit-functional/org/jgroups/protocols/dns/AddressedDNSResolverTest.java
@@ -8,7 +8,7 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-public class DefaultDNSResolverTest {
+public class AddressedDNSResolverTest {
 
    @Test
    public void test_parsing_a_entries() throws Exception {
@@ -17,7 +17,7 @@ public void test_parsing_a_entries() throws Exception {
             .addEntry("test", "192.168.0.1", DNSResolver.DNSRecordType.A)
             .addEntry("test", "192.168.0.2", DNSResolver.DNSRecordType.A);
 
-      DefaultDNSResolver resolver = new DefaultDNSResolver(mockDirContext);
+      AddressedDNSResolver resolver = new AddressedDNSResolver(mockDirContext);
 
       //when
       List<Address> addresses = resolver.resolveIps("test", DNSResolver.DNSRecordType.A);
@@ -51,7 +51,7 @@ public void test_parsing_srv_entries() throws Exception {
             .addEntry("9089f34a.jgroups-dns-ping.local", "192.168.0.1", DNSResolver.DNSRecordType.A)
             .addEntry("9089f34a.jgroups-dns-ping.local", "192.168.0.2", DNSResolver.DNSRecordType.A);
 
-      DefaultDNSResolver resolver = new DefaultDNSResolver(mockDirContext);
+      AddressedDNSResolver resolver = new AddressedDNSResolver(mockDirContext);
 
       //when
       List<Address> addresses = resolver.resolveIps("test", DNSResolver.DNSRecordType.SRV);
diff --git a/tests/junit-functional/org/jgroups/protocols/dns/DNS_PINGTest.java b/tests/junit-functional/org/jgroups/protocols/dns/DNS_PINGTest.java
index 74870779a65..884f85d128c 100644
--- a/tests/junit-functional/org/jgroups/protocols/dns/DNS_PINGTest.java
+++ b/tests/junit-functional/org/jgroups/protocols/dns/DNS_PINGTest.java
@@ -44,8 +44,8 @@ public void test_failing_on_no_dns_query() throws Exception {
    public void test_valid_dns_response() throws Exception {
       //given
       DNSDiscoveryTester dns_discovery_tester = new DNSDiscoveryTester(2, PORT_START, 500, TimeUnit.SECONDS)
-            .add("test.svc.cluster.local", DNSResolver.DNSRecordType.A, new IpAddress(InetAddress.getLoopbackAddress(), PORT_START))
-            .add("test.svc.cluster.local", DNSResolver.DNSRecordType.A, new IpAddress(InetAddress.getLoopbackAddress(), PORT_START + 1));
+            .add("test", DNSResolver.DNSRecordType.A, new IpAddress(InetAddress.getLoopbackAddress(), PORT_START))
+            .add("test", DNSResolver.DNSRecordType.A, new IpAddress(InetAddress.getLoopbackAddress(), PORT_START + 1));
 
       //when
       boolean was_view_received = dns_discovery_tester.runTestAndCheckIfViewWasReceived("test", "A");