diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini
index 784b4db648..3c86847bf9 100644
--- a/etc/dhcp_agent.ini
+++ b/etc/dhcp_agent.ini
@@ -3,9 +3,8 @@
 # debug = true
 
 # Where to store dnsmasq state files.  This directory must be writable by the
-# user executing the agent. The value below is compatible with a default
-# devstack installation.
-state_path = /opt/stack/data
+# user executing the agent.
+# state_path = /var/lib/quantum
 
 # The DHCP agent will resync its state with Quantum to recover from any
 # transient notification or rpc errors. The interval is number of
diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini
index f495436d04..1e6ad199d7 100644
--- a/etc/l3_agent.ini
+++ b/etc/l3_agent.ini
@@ -28,11 +28,6 @@ root_helper = sudo
 
 # If use_namespaces is set as False then the agent can only configure one router.
 
-# Where to store metadata state files.  This directory must be writable by the
-# user executing the agent. The value below is compatible with a default
-# devstack installation.
-state_path = /opt/stack/data/quantum
-
 # This is done by setting the specific router_id.
 # router_id =
 
diff --git a/etc/metadata_agent.ini b/etc/metadata_agent.ini
index bb5aac160b..51169210a5 100644
--- a/etc/metadata_agent.ini
+++ b/etc/metadata_agent.ini
@@ -15,9 +15,8 @@ admin_password = %SERVICE_PASSWORD%
 root_helper = sudo
 
 # Where to store metadata state files.  This directory must be writable by the
-# user executing the agent. The value below is compatible with a default
-# devstack installation.
-state_path = /opt/stack/data/quantum
+# user executing the agent.
+# state_path = /var/lib/quantum
 
 # IP address used by Nova metadata server
 # nova_metadata_ip = 127.0.0.1
diff --git a/quantum/common/config.py b/quantum/common/config.py
index 78e9a0b14e..ee5c514e36 100644
--- a/quantum/common/config.py
+++ b/quantum/common/config.py
@@ -48,7 +48,7 @@ core_opts = [
     cfg.BoolOpt('allow_bulk', default=True),
     cfg.IntOpt('max_dns_nameservers', default=5),
     cfg.IntOpt('max_subnet_host_routes', default=20),
-    cfg.StrOpt('state_path', default='.'),
+    cfg.StrOpt('state_path', default='/var/lib/quantum'),
     cfg.IntOpt('dhcp_lease_duration', default=120),
     cfg.BoolOpt('allow_overlapping_ips', default=False),
     cfg.StrOpt('control_exchange',