diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh
index f9b5cb350f..7d5526f9ac 100755
--- a/contrib/ci/post_test_hook.sh
+++ b/contrib/ci/post_test_hook.sh
@@ -31,7 +31,7 @@ fi
 set +o errexit
 cd $BASE/new/tempest
 
-export TEMPEST_CONCURRENCY=6
+export TEMPEST_CONCURRENCY=12
 export MANILA_TESTS='tempest.cli.*manila*'
 if [[ ! "$ZUUL_PROJECT" =~ python-manilaclient ]]; then
     MANILA_TESTS+=' tempest.api.share*';
diff --git a/contrib/devstack/extras.d/70-manila.sh b/contrib/devstack/extras.d/70-manila.sh
index c4c54b3b33..698397f3f6 100644
--- a/contrib/devstack/extras.d/70-manila.sh
+++ b/contrib/devstack/extras.d/70-manila.sh
@@ -7,6 +7,7 @@ if is_service_enabled manila; then
     elif [[ "$1" == "stack" && "$2" == "install" ]]; then
         echo_summary "Installing Manila"
         install_manila
+        set_cinder_quotas
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         echo_summary "Configuring Manila"
         configure_manila
diff --git a/contrib/devstack/lib/manila b/contrib/devstack/lib/manila
index 778ae8597a..4381e08faf 100644
--- a/contrib/devstack/lib/manila
+++ b/contrib/devstack/lib/manila
@@ -162,6 +162,19 @@ function set_config_opts {
     fi
 }
 
+function set_cinder_quotas {
+    # Update Cinder configuration to make sure default quotas are enough
+    # for Manila using Generic driver with parallel testing.
+    if is_service_enabled cinder; then
+        if [[ ! "$CINDER_CONF" ]]; then
+            CINDER_CONF=/etc/cinder/cinder.conf
+        fi
+        iniset $CINDER_CONF DEFAULT quota_volumes 50
+        iniset $CINDER_CONF DEFAULT quota_snapshots 50
+        iniset $CINDER_CONF DEFAULT quota_gigabytes 1000
+    fi
+}
+
 # configure_manila - Set config files, create data dirs, etc
 function configure_manila {
     setup_develop $MANILA_DIR
diff --git a/manila/quota.py b/manila/quota.py
index ba4278251f..565f0f4127 100644
--- a/manila/quota.py
+++ b/manila/quota.py
@@ -32,10 +32,10 @@ LOG = logging.getLogger(__name__)
 
 quota_opts = [
     cfg.IntOpt('quota_shares',
-               default=10,
+               default=50,
                help='Number of shares allowed per project.'),
     cfg.IntOpt('quota_snapshots',
-               default=10,
+               default=50,
                help='Number of share snapshots allowed per project.'),
     cfg.IntOpt('quota_gigabytes',
                default=1000,