--- /usr/share/ucs-test/scripts/20_dns/00basic10zones.orig	2011-12-05 17:52:13.000000000 +0000
+++ /usr/share/ucs-test/scripts/20_dns/00basic10zones	2011-12-05 17:54:15.000000000 +0000
@@ -14,6 +14,10 @@
 from ucsTest import checkOutput, rev, resolve, errorDetected
 import time
 import random # Bug16618
+import univention.config_registry as ucr
+
+configRegistry = ucr.ConfigRegistry()
+configRegistry.load()
 
 sleeptime = 90 #s delay for bind-restart
 
@@ -31,7 +35,7 @@
 removeorder = []
 superordinate = {}
 
-nameserver = 'localhost'
+nameserver = '%s.%s.' % (configRegistry['hostname'], configRegistry['domainname'])
 #DNS FORWARD ZONE
 mod = 'dns/forward_zone'
 fz_pos = rdn('cn=dns')