diff --git a/tempest/cli/__init__.py b/tempest/cli/__init__.py
index a4c8316399..bd1b44f666 100644
--- a/tempest/cli/__init__.py
+++ b/tempest/cli/__init__.py
@@ -33,7 +33,7 @@ cli_opts = [
                 default=True,
                 help="enable cli tests"),
     cfg.StrOpt('cli_dir',
-               default='/usr/local/bin/',
+               default='/usr/local/bin',
                help="directory where python client binaries are located"),
     cfg.IntOpt('timeout',
                default=15,
diff --git a/tempest/config.py b/tempest/config.py
index 77dc0088f5..925c4bdc06 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -324,7 +324,7 @@ VolumeGroup = [
                help='Timeout in seconds to wait for a volume to become'
                     'available.'),
     cfg.StrOpt('catalog_type',
-               default='Volume',
+               default='volume',
                help="Catalog type of the Volume Service"),
     cfg.StrOpt('region',
                default='',