diff --git a/ceilometer/files/liberty/ceilometer-agent.conf.Debian b/ceilometer/files/liberty/ceilometer-agent.conf.Debian
index b4f818b..9ee6902 100644
--- a/ceilometer/files/liberty/ceilometer-agent.conf.Debian
+++ b/ceilometer/files/liberty/ceilometer-agent.conf.Debian
@@ -498,7 +498,7 @@
 # Region name to use for OpenStack service endpoints. (string
 # value)
 #os_region_name=<None>
-os_region_name=RegionOne
+os_region_name={{ agent.get('region', 'RegionOne') }}
 
 # Type of endpoint in Identity service catalog to use for
 # communication with OpenStack services. (string value)
diff --git a/ceilometer/files/liberty/ceilometer-server.conf.Debian b/ceilometer/files/liberty/ceilometer-server.conf.Debian
index 1976011..ea1dbde 100644
--- a/ceilometer/files/liberty/ceilometer-server.conf.Debian
+++ b/ceilometer/files/liberty/ceilometer-server.conf.Debian
@@ -596,6 +596,7 @@
 # Options defined in ceilometer.service
 #
 
+
 # User name to use for OpenStack service access. (string
 # value)
 #os_username=ceilometer
@@ -624,7 +625,7 @@
 # Region name to use for OpenStack service endpoints. (string
 # value)
 #os_region_name=<None>
-os_region_name=RegionOne
+os_region_name={{ agent.get('region', 'RegionOne') }}
 
 # Type of endpoint in Identity service catalog to use for
 # communication with OpenStack services. (string value)
diff --git a/tests/pillar/agent_cluster.sls b/tests/pillar/agent_cluster.sls
index a3e9d4c..136de57 100644
--- a/tests/pillar/agent_cluster.sls
+++ b/tests/pillar/agent_cluster.sls
@@ -1,5 +1,6 @@
 ceilometer:
   agent:
+    region: RegionOne
     enabled: true
     version: liberty
     secret: password
diff --git a/tests/pillar/agent_single.sls b/tests/pillar/agent_single.sls
index a4e54de..b893ff3 100644
--- a/tests/pillar/agent_single.sls
+++ b/tests/pillar/agent_single.sls
@@ -1,5 +1,6 @@
 ceilometer:
   agent:
+    #region: RegionOne
     enabled: true
     version: liberty
     secret: password
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 9b3c41c..04aa4bb 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -1,5 +1,6 @@
 ceilometer:
   server:
+    region: RegionOne
     enabled: true
     version: liberty
     cluster: true
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index 201f3d1..39be0de 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -1,5 +1,6 @@
 ceilometer:
   server:
+    #region: RegionOne
     enabled: true
     version: liberty
     secret: password