diff --git a/tasks/create_server.yml b/tasks/create_server.yml
index 18788ff..fe25270 100644
--- a/tasks/create_server.yml
+++ b/tasks/create_server.yml
@@ -5,7 +5,7 @@
 - os_server:
     cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
     state: "{{ item_server.state|default(omit) }}"
-    name: "{{ item_server.name }}"
+    name: "{{ item_server.name.partition('.')[0] }}{{ '' if item_server.node_count is not defined else item }}{{ item_server.name.partition('.')[1] + item_server.name.partition('.')[2] }}"
     image: "{{ item_server.image }}"
     auto_ip: "{{ item_server.auto_ip|default(omit) }}"
     boot_from_volume: "{{ item_server.boot_from_volume|default(omit) }}"
@@ -28,6 +28,7 @@
     userdata: "{{ item_server.userdata|default(omit) }}"
     volume_size: "{{ item_server.volume_size|default(omit) }}"
     volumes: "{{ item_server.volumes|default(omit) }}"
+  with_sequence: start=1 end={{ item_server.node_count|default(1) }} format=%02x
   register: os_server_result
 
 - add_host: name={{ item.server.name }} groups=cl_servers_just_created ansible_ssh_host={{ item.server.public_v4 }}
diff --git a/tests/resources.yml b/tests/resources.yml
index c16f659..80b2cd8 100644
--- a/tests/resources.yml
+++ b/tests/resources.yml
@@ -29,6 +29,16 @@ clouds:
         image: cirros-0.3.4-x86_64-uec
         flavor: c1
         network: test_network
+      - name: test_cluster
+        image: cirros-0.3.4-x86_64-uec
+        flavor: c1
+        network: test_network
+        node_count: 2
+      - name: test_cluster.testdomain
+        image: cirros-0.3.4-x86_64-uec
+        flavor: c1
+        network: test_network
+        node_count: 2
     networks:
       - name: test_network
     subnets:
diff --git a/tests/test.yaml b/tests/test.yaml
index b6c1be6..c0c21c5 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -68,3 +68,35 @@
 
     - name: Assert test-network network has been created
       assert: { that: result.rc == 0 }
+
+    - name: Querying for test_cluster01 server
+      command: openstack --os-cloud devstack server show test_cluster01
+      register: result
+      changed_when: False
+
+    - name: Assert test_cluster01 server has been created
+      assert: { that: result.rc == 0 }
+
+    - name: Querying for test_cluster02 server
+      command: openstack --os-cloud devstack server show test_cluster02
+      register: result
+      changed_when: False
+
+    - name: Assert test_cluster02 server has been created
+      assert: { that: result.rc == 0 }
+
+    - name: Querying for test_cluster01.testdomain server
+      command: openstack --os-cloud devstack server show test_cluster01.testdomain
+      register: result
+      changed_when: False
+
+    - name: Assert test_cluster01.testdomain server has been created
+      assert: { that: result.rc == 0 }
+
+    - name: Querying for test_cluster02.testdomain server
+      command: openstack --os-cloud devstack server show test_cluster02.testdomain
+      register: result
+      changed_when: False
+
+    - name: Assert test_cluster02.testdomain server has been created
+      assert: { that: result.rc == 0 }