diff --git a/keystone/files/keystone.domain.conf b/keystone/files/keystone.domain.conf
index 00b6200..46408eb 100644
--- a/keystone/files/keystone.domain.conf
+++ b/keystone/files/keystone.domain.conf
@@ -12,6 +12,9 @@
 {%- else %}
 driver = keystone.identity.backends.sql.Identity
 {%- endif %}
+{%- if domain.get('identity',{}).list_limit is defined %}
+list_limit = {{ domain.identity.list_limit }}
+{%- endif %}
 
 [assignment]
 {%- if domain.get("assignment", {}).get("backend", "sql") == "ldap" %}
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index 898b6ae..c6d7cc6 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -44,3 +44,8 @@
         port: 11211
       - host: 127.0.0.1
         port: 11211
+    domain:
+      test:
+        description: "Test domain"
+        identity:
+          list_limit: 20