diff --git a/python/samba/tests/dns.py b/python/samba/tests/dns.py
index 77aa43a856f..26393f1c088 100644
--- a/python/samba/tests/dns.py
+++ b/python/samba/tests/dns.py
@@ -30,7 +30,8 @@ import socket
 import samba.ndr as ndr
 from samba import credentials
 from samba.dcerpc import dns, dnsp, dnsserver
-from samba.netcmd.dns import TXTRecord, dns_record_match, data_to_dns_record
+from samba.dnsserver import TXTRecord
+from samba.netcmd.dns import dns_record_match, data_to_dns_record
 from samba.tests.subunitrun import SubunitOptions, TestProgram
 from samba import werror, WERRORError
 from samba.tests.dns_base import DNSTest
diff --git a/python/samba/tests/dns_forwarder.py b/python/samba/tests/dns_forwarder.py
index 0af885913a8..53baa3bb172 100644
--- a/python/samba/tests/dns_forwarder.py
+++ b/python/samba/tests/dns_forwarder.py
@@ -27,7 +27,8 @@ import samba.ndr as ndr
 from samba import credentials, param
 from samba.tests import TestCase
 from samba.dcerpc import dns, dnsp, dnsserver
-from samba.netcmd.dns import TXTRecord, dns_record_match, data_to_dns_record
+from samba.dnsserver import TXTRecord
+from samba.netcmd.dns import dns_record_match, data_to_dns_record
 from samba.tests.subunitrun import SubunitOptions, TestProgram
 import samba.getopt as options
 import optparse