2 files changed, 7 insertions, 4 deletions

diff --git a/src/cli/gns/test_dns2gns.conf b/src/cli/gns/test_dns2gns.conf
index f484d4114..2f6bdc797 100644
--- a/src/cli/gns/test_dns2gns.conf
+++ b/src/cli/gns/test_dns2gns.conf
@@ -18,7 +18,7 @@ MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s
 RECORD_PUT_INTERVAL = 1 h
 ZONE_PUBLISH_TIME_WINDOW = 1 h
-DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0
+.gnunet.org =
 
 [namestore]
 IMMEDIATE_START = YES
@@ -65,4 +65,5 @@ IMMEDIATE_START = YES
 RUN_PER_USER = YES
 BIND_TO = 127.0.0.1
 BIND_TO6 = ::1
-OPTIONS = -d 1.1.1.1 -p 12000
+PORT = 12000
+OPTIONS = -d 1.1.1.1
diff --git a/src/cli/gns/test_dns2gns.sh b/src/cli/gns/test_dns2gns.sh
index 295bcc766..a6024ca3c 100755
--- a/src/cli/gns/test_dns2gns.sh
+++ b/src/cli/gns/test_dns2gns.sh
@@ -20,7 +20,7 @@ MY_EGO="localego"
 TEST_IP="127.0.0.1"
 TEST_IPV6="dead::beef"
 LABEL="fnord"
-TEST_DOMAIN="gnunet.org"
+TEST_DOMAIN="taler.net"
 
 gnunet-arm -s -c test_dns2gns.conf
 PKEY=`gnunet-identity -V -C $MY_EGO -c test_dns2gns.conf`
@@ -34,14 +34,16 @@ if nslookup -port=12000 $LABEL.$PKEY localhost && nslookup -port=12000 $LABEL.$M
   echo "PASS: GNS records can be resolved using dns2gns bridge"
 else
   echo "FAIL: GNS records can't be resolved using dns2gns bridge"
+  gnunet-arm -e -c test_dns2gns.conf
   rm -rf `gnunet-config -c test_dns2gns.conf -f -s paths -o GNUNET_TEST_HOME`
   exit 1
 fi
 
-if nslookup -port=12000 gnunet.org localhost; then
+if nslookup -port=12000 $TEST_DOMAIN localhost; then
   echo "PASS: DNS records can be resolved using dns2gns bridge"
 else
   echo "FAIL: DNS records can't be resolved using dns2gns bridge"
+  gnunet-arm -e -c test_dns2gns.conf
   rm -rf `gnunet-config -c test_dns2gns.conf -f -s paths -o GNUNET_TEST_HOME`
   exit 1
 fi