diff --git a/setup.cfg b/setup.cfg
index 4e0712b..b215df4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,7 +28,6 @@ packages =
 data_files =
     etc/sahara =
         etc/sahara/api-paste.ini
-        etc/sahara/policy.json
         etc/sahara/rootwrap.conf
     etc/sahara/rootwrap.d = etc/sahara/rootwrap.d/*
 
@@ -82,6 +81,9 @@ oslo.config.opts =
 oslo.config.opts.defaults =
     sahara.config = sahara.common.config:set_cors_middleware_defaults
 
+oslo.policy.policies =
+    sahara = sahara.common.policies:list_rules
+
 [build_sphinx]
 all_files = 1
 build-dir = doc/build
diff --git a/tox.ini b/tox.ini
index da2cbdf..77a211d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py27,pep8
+envlist = py35,py27,pep8,genpolicy
 minversion = 1.6
 skipsdist = True
 
@@ -36,6 +36,9 @@ commands =
     # Run security linter
     bandit -c bandit.yaml -r sahara -n5 -p sahara_default -x tests
 
+[testenv:genpolicy]
+commands = oslopolicy-sample-generator --config-file tools/config/sahara-policy-generator.conf
+
 [testenv:venv]
 commands = {posargs}