diff --git a/.kitchen.yml b/.kitchen.yml
index c227138..bdcae80 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -65,6 +65,11 @@
       pillars-from-files:
         kubernetes.sls: tests/pillar/pool_cluster.sls
 
+  - name: pool_cluster_with_domain
+    provisioner:
+      pillars-from-files:
+        kubernetes.sls: tests/pillar/pool_cluster_with_domain.sls
+
   - name: master_contrail
     provisioner:
       pillars-from-files:
diff --git a/kubernetes/files/calico/calico-node.service.master b/kubernetes/files/calico/calico-node.service.master
index 6c82298..995f517 100644
--- a/kubernetes/files/calico/calico-node.service.master
+++ b/kubernetes/files/calico/calico-node.service.master
@@ -8,7 +8,7 @@
 ExecStartPre=-/usr/bin/docker rm -f calico-node
 ExecStart=/usr/bin/docker run --net=host --privileged \
  --name=calico-node \
- -e NODENAME={{ master.host.name }} \
+ -e NODENAME={{ master.host.name }}{% if master.host.get('domain') %}.{{ master.host.domain }}{%- endif %} \
  -e IP={{ master.apiserver.address }} \
  -e IP6={{ master.get('ipv6_address', '') }} \
 {%- if master.network.calico_network_backend is defined %}
diff --git a/kubernetes/files/calico/calico-node.service.pool b/kubernetes/files/calico/calico-node.service.pool
index e156327..305518f 100644
--- a/kubernetes/files/calico/calico-node.service.pool
+++ b/kubernetes/files/calico/calico-node.service.pool
@@ -8,7 +8,7 @@
 ExecStartPre=-/usr/bin/docker rm -f calico-node
 ExecStart=/usr/bin/docker run --net=host --privileged \
  --name=calico-node \
- -e NODENAME={{ pool.host.name }} \
+ -e NODENAME={{ pool.host.name }}{% if pool.host.get('domain') %}.{{ pool.host.domain }}{%- endif %} \
  -e IP={{ pool.address }} \
  -e IP6={{ pool.get('ipv6_address', '') }} \
 {%- if pool.network.calico_network_backend is defined %}
diff --git a/tests/pillar/pool_cluster_with_domain.sls b/tests/pillar/pool_cluster_with_domain.sls
new file mode 100644
index 0000000..6201348
--- /dev/null
+++ b/tests/pillar/pool_cluster_with_domain.sls
@@ -0,0 +1,68 @@
+kubernetes:
+  common:
+    cluster_domain: cluster.local
+    cluster_name: cluster
+    network:
+      engine: none
+    hyperkube:
+      image: hyperkube-amd64:v1.6.4-3
+      hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
+    addons:
+      dns:
+        domain: cluster.local
+        enabled: false
+        replicas: 1
+        server: 10.254.0.10
+        autoscaler:
+          enabled: true
+      virtlet:
+        enabled: true
+        namespace: kube-system
+        image: mirantis/virtlet:v0.7.0
+        hosts:
+        - cmp01
+        - cmp02
+  pool:
+    enabled: true
+    version: v1.2.0
+    host:
+      name: ${linux:system:name}
+      domain: ${linux:system:domain}
+    apiserver:
+      host: 127.0.0.1
+      secure_port: 443
+      insecure:
+        enabled: True
+      insecure_port: 8080
+      members:
+        - host: 127.0.0.1
+        - host: 127.0.0.1
+        - host: 127.0.0.1
+    address: 0.0.0.0
+    kubelet:
+      config: /etc/kubernetes/manifests
+      allow_privileged: True
+      frequency: 5s
+    token:
+      kubelet: 7bN5hJ9JD4fKjnFTkUKsvVNfuyEddw3r
+      kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
+    ca: kubernetes
+    network:
+      calicoctl:
+        image: calico/ctl
+      cni:
+        image: calico/cni
+      engine: calico
+      hash: c15ae251b633109e63bf128c2fbbc34a
+      ipam:
+        hash: 6e6d7fac0567a8d90a334dcbfd019a99
+        version: v1.3.1
+      version: v0.20.0
+      etcd:
+        members:
+        - host: 127.0.0.1
+          port: 4001
+        - host: 127.0.0.1
+          port: 4001
+        - host: 127.0.0.1
+          port: 4001