diff --git a/test/260_use_name_as_hostname_test.sh b/test/260_use_name_as_hostname_test.sh
index f4073487..e5d22b5d 100755
--- a/test/260_use_name_as_hostname_test.sh
+++ b/test/260_use_name_as_hostname_test.sh
@@ -12,15 +12,15 @@ start_suite "Use container name as hostname"
 weave_on $HOST1 launch -iprange 10.2.0.0/24
 
 start_container_with_dns $HOST1 --name=c1-name
-start_container_with_dns $HOST1 --name=c2-name -h c2-hostname.weave.local
-start_container_with_dns $HOST1 --name=c3-name --hostname=c3-hostname.weave.local
-start_container_with_dns $HOST1 -h c4-hostname.weave.local --name=c4-name
-start_container_with_dns $HOST1 --hostname=c5-hostname.weave.local --name=c5-name
+start_container_with_dns $HOST1 --name=c2-name -h c2-hostname.weave.local.
+start_container_with_dns $HOST1 --name=c3-name --hostname=c3-hostname.weave.local.
+start_container_with_dns $HOST1 -h c4-hostname.weave.local. --name=c4-name
+start_container_with_dns $HOST1 --hostname=c5-hostname.weave.local. --name=c5-name
 
-assert "docker_inspect_fqdn $HOST1 c1-name" "c1-name.weave.local"
-assert "docker_inspect_fqdn $HOST1 c2-name" "c2-hostname.weave.local"
-assert "docker_inspect_fqdn $HOST1 c3-name" "c3-hostname.weave.local"
-assert "docker_inspect_fqdn $HOST1 c4-name" "c4-hostname.weave.local"
-assert "docker_inspect_fqdn $HOST1 c5-name" "c5-hostname.weave.local"
+assert "docker_inspect_fqdn $HOST1 c1-name" "c1-name.weave.local."
+assert "docker_inspect_fqdn $HOST1 c2-name" "c2-hostname.weave.local."
+assert "docker_inspect_fqdn $HOST1 c3-name" "c3-hostname.weave.local."
+assert "docker_inspect_fqdn $HOST1 c4-name" "c4-hostname.weave.local."
+assert "docker_inspect_fqdn $HOST1 c5-name" "c5-hostname.weave.local."
 
 end_suite
diff --git a/weave b/weave
index 9a5f8f08..c2fc26f3 100755
--- a/weave
+++ b/weave
@@ -670,12 +670,12 @@ dns_args() {
 }
 
 # Use the weaveDNS REST API to determine the local domain. If weaveDNS is not
-# running, return the default value ('weave.local')
+# running, return the default value ('weave.local.')
 dns_domain() {
     if DOMAIN=$(http_call $DNS_CONTAINER_NAME $DNS_HTTP_PORT GET /domain 2>/dev/null) ; then
-        echo ${DOMAIN%.}
+        echo $DOMAIN
     else
-        echo 'weave.local'
+        echo 'weave.local.'
     fi
 }
 
@@ -706,9 +706,9 @@ with_container_fqdn() {
     COMMAND="$2"
     shift 2
 
-    CONTAINER_FQDN=$(docker inspect --format='{{.Config.Hostname}}.{{.Config.Domainname}}.' $CONTAINER 2>/dev/null) || return 0
+    CONTAINER_FQDN=$(docker inspect --format='{{.Config.Hostname}}.{{.Config.Domainname}}' $CONTAINER 2>/dev/null) || return 0
 
-    if echo "$CONTAINER_FQDN" | grep -qv '\.\.$' ; then
+    if echo "$CONTAINER_FQDN" | grep -Eq '[^.]+\..+' ; then
         $COMMAND "$CONTAINER" "$CONTAINER_FQDN" "$@"
     fi
 }