diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index ef6ff448ec..0f5436d964 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -299,7 +299,7 @@
 
 # Top-level directory for maintaining nova's state (string
 # value)
-#state_path=/var/lib/nova
+#state_path=$pybasedir
 
 
 #
diff --git a/nova/paths.py b/nova/paths.py
index a19d5115df..5fc556057a 100644
--- a/nova/paths.py
+++ b/nova/paths.py
@@ -29,7 +29,7 @@ path_opts = [
                default=os.path.join(sys.prefix, 'local', 'bin'),
                help='Directory where nova binaries are installed'),
     cfg.StrOpt('state_path',
-               default='/var/lib/nova',
+               default='$pybasedir',
                help="Top-level directory for maintaining nova's state"),
 ]
 
diff --git a/nova/tests/conf_fixture.py b/nova/tests/conf_fixture.py
index db9747a360..ea25656258 100644
--- a/nova/tests/conf_fixture.py
+++ b/nova/tests/conf_fixture.py
@@ -14,8 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
-
 from oslo.config import cfg
 
 
@@ -43,8 +41,6 @@ class ConfFixture(config_fixture.Config):
     """Fixture to manage global conf settings."""
     def setUp(self):
         super(ConfFixture, self).setUp()
-        self.conf.set_default('state_path', os.path.abspath(
-            os.path.join(os.path.dirname(__file__), '..', '..')))
         self.conf.set_default('api_paste_config',
                               paths.state_path_def('etc/nova/api-paste.ini'))
         self.conf.set_default('host', 'fake-mini')