diff --git a/tests/functional/centos/7/cluster/group_vars/rgws b/tests/functional/centos/7/cluster/group_vars/rgws
new file mode 100644
index 000000000..6aab772a0
--- /dev/null
+++ b/tests/functional/centos/7/cluster/group_vars/rgws
@@ -0,0 +1,8 @@
+copy_admin_key: true
+create_pools:
+  foo:
+    pg_num: 17
+  bar:
+    pg_num: 19
+rgw_override_bucket_index_max_shards: 16
+rgw_bucket_default_quota_max_objects: 1638400
diff --git a/tests/functional/centos/7/docker-cluster/group_vars/all b/tests/functional/centos/7/docker-cluster/group_vars/all
index 56cf5cbde..34fcbb887 100644
--- a/tests/functional/centos/7/docker-cluster/group_vars/all
+++ b/tests/functional/centos/7/docker-cluster/group_vars/all
@@ -22,3 +22,5 @@ devices:
   - /dev/sda
   - /dev/sdb
 ceph_osd_docker_run_script_path: /var/tmp
+rgw_override_bucket_index_max_shards: 16
+rgw_bucket_default_quota_max_objects: 1638400
diff --git a/tests/functional/tests/rgw/test_rgw_tuning.py b/tests/functional/tests/rgw/test_rgw_tuning.py
new file mode 100644
index 000000000..4c172d939
--- /dev/null
+++ b/tests/functional/tests/rgw/test_rgw_tuning.py
@@ -0,0 +1,18 @@
+import pytest
+
+
+class TestRGWs(object):
+
+    def test_rgw_bucket_default_quota_is_set(self, node, File):
+        assert File(node["conf_path"]).contains("rgw override bucket index max shards")
+        assert File(node["conf_path"]).contains("rgw bucket default quota max objects")
+
+    @pytest.mark.no_docker
+    def test_rgw_tuning_pools_are_set(self, node, Command):
+        cmd = "sudo ceph --cluster={} --connect-timeout 5 osd dump".format(node["cluster_name"])
+        output = Command.check_output(cmd)
+        pools = node["vars"]["create_pools"]
+        for pool_name, pg_num in pools.items():
+            assert pool_name in output
+            pg_num_str = "pg_num {pg_num}".format(pg_num = pg_num["pg_num"])
+            assert pg_num_str in output
diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/rgws b/tests/functional/ubuntu/16.04/cluster/group_vars/rgws
new file mode 100644
index 000000000..6aab772a0
--- /dev/null
+++ b/tests/functional/ubuntu/16.04/cluster/group_vars/rgws
@@ -0,0 +1,8 @@
+copy_admin_key: true
+create_pools:
+  foo:
+    pg_num: 17
+  bar:
+    pg_num: 19
+rgw_override_bucket_index_max_shards: 16
+rgw_bucket_default_quota_max_objects: 1638400