diff --git a/roles/testdata-noblogs/defaults/main.yml b/roles/testdata-noblogs/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..648f9ead1ec2a36516c833a29a0db5b3da7dc7d4
--- /dev/null
+++ b/roles/testdata-noblogs/defaults/main.yml
@@ -0,0 +1,7 @@
+---
+
+testdata_noblogs_blogs:
+  - cavallette
+  - detriti
+  - docs
+
diff --git a/roles/testdata-noblogs/templates/noblogs-batch.dat.j2 b/roles/testdata-noblogs/templates/noblogs-batch.dat.j2
index 0557c763ef0ee4e47277a1e069e69dd42cb61f9c..43714c8a8d13cf755af89d0b0329ec1739bdbb0f 100644
--- a/roles/testdata-noblogs/templates/noblogs-batch.dat.j2
+++ b/roles/testdata-noblogs/templates/noblogs-batch.dat.j2
@@ -9,6 +9,8 @@
     Since we can't know which shard the algorithm will put the
     sample blogs on, we load the data on each of them
 #}
-{{ hostvars[h].shard_id }} testdata-install-noblogs sql noblogs_{{ hostvars[h].shard_id }} noblogs_cavallette.sql.xz
-{{ hostvars[h].shard_id }} testdata-install-noblogs data cavallette_data.tar.xz
+{% for blog in testdata_noblogs_blogs %}
+{{ hostvars[h].shard_id }} testdata-install-noblogs sql noblogs_{{ hostvars[h].shard_id }} noblogs_{{ blog }}.sql.xz
+{{ hostvars[h].shard_id }} testdata-install-noblogs data {{ blog }}_data.tar.xz
+{% endfor %}
 {% endfor %}