diff --git a/test/260_use_name_as_hostname_test.sh b/test/260_use_name_as_hostname_test.sh
index 005a4f4c..317d893f 100755
--- a/test/260_use_name_as_hostname_test.sh
+++ b/test/260_use_name_as_hostname_test.sh
@@ -2,29 +2,35 @@
 
 . ./config.sh
 
+NAME=c1
+DOMAIN=weave.local.
+HOSTNAME=$NAME-hostname.$DOMAIN
+
 # Docker inspect hostname + domainname of container $2 on host $1
 docker_inspect_fqdn() {
     docker_on $1 inspect --format='{{.Config.Hostname}}.{{.Config.Domainname}}' $2
 }
 
+# Start container with args $2.. and assert fqdn of $1
+assert_expected_fqdn() {
+    EXPECTED_FQDN=$1
+    shift
+    start_container_with_dns $HOST1 "$@"
+    assert "docker_inspect_fqdn $HOST1 $NAME" $EXPECTED_FQDN
+    docker_on $HOST1 rm -f $NAME
+}
+
 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 --name=c4-name --hostname c4-hostname.weave.local.
-start_container_with_dns $HOST1 -h c5-hostname.weave.local. --name=c5-name
-start_container_with_dns $HOST1 --hostname=c6-hostname.weave.local. --name=c6-name
-start_container_with_dns $HOST1 --hostname c7-hostname.weave.local. --name=c7-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 c6-name" "c6-hostname.weave.local."
-assert "docker_inspect_fqdn $HOST1 c7-name" "c7-hostname.weave.local."
+assert_expected_fqdn "$NAME.$DOMAIN" --name=$NAME
+assert_expected_fqdn "$NAME.$DOMAIN" --name $NAME
+assert_expected_fqdn "$HOSTNAME"     --name=$NAME         -h $HOSTNAME
+assert_expected_fqdn "$HOSTNAME"     --name=$NAME         --hostname=$HOSTNAME
+assert_expected_fqdn "$HOSTNAME"     --name=$NAME         --hostname $HOSTNAME
+assert_expected_fqdn "$HOSTNAME"     -h $HOSTNAME         --name=$NAME
+assert_expected_fqdn "$HOSTNAME"     --hostname=$HOSTNAME --name=$NAME
+assert_expected_fqdn "$HOSTNAME"     --hostname $HOSTNAME --name=$NAME
 
 end_suite