diff --git a/tests/pillar/generate_multi.sls b/tests/pillar/generate_multi.sls
index 628724e..dfaffd2 100644
--- a/tests/pillar/generate_multi.sls
+++ b/tests/pillar/generate_multi.sls
@@ -10,15 +10,18 @@
         classes:
         - cluster.deployment.service.role
         repeat:
+          ip_ranges:
+            single_address: '172.16.10.101-172.16.10.254'
+            deploy_address: '172.16.20.101-172.16.20.254'
           count: 2
           start: 5
           digits: 2
           params:
             single_address:
-              value: 10.0.0.<<count>>
+              value: <<single_address>>
               start: 100
             deploy_address:
-              value: part-<<count>>-whole
+              value: <<deploy_address>>
               start: 5
               digits: 3
         params:
diff --git a/tests/pillar/generate_multi_interpolate.sls b/tests/pillar/generate_multi_interpolate.sls
index 113aff3..abc15ae 100644
--- a/tests/pillar/generate_multi_interpolate.sls
+++ b/tests/pillar/generate_multi_interpolate.sls
@@ -9,12 +9,14 @@
         classes:
         - cluster.deployment.service.role
         repeat:
+          ip_ranges:
+            single_address: '172.16.10.101-172.16.10.254'
           count: 2
           start: 5
           digits: 2
           params:
             single_address:
-              value: ceph_osd_node<<count>>_address
+              value: <<single_address>>
               start: 1
               digits: 2
               interpolate: true