diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index 319f10d..a8b5ac4 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -298,7 +298,9 @@ class OpenStackShell(app.App):
 
         # Loop through extensions to get API versions
         for mod in clientmanager.PLUGIN_MODULES:
-            version_opt = getattr(self.options, mod.API_VERSION_OPTION, None)
+            default_version = getattr(mod, 'DEFAULT_API_VERSION', None)
+            option = mod.API_VERSION_OPTION.replace('os_', '')
+            version_opt = self.cloud.config.get(option, default_version)
             if version_opt:
                 api = mod.API_NAME
                 self.api_version[api] = version_opt
diff --git a/openstackclient/tests/test_shell.py b/openstackclient/tests/test_shell.py
index e2f0580..0e0cc50 100644
--- a/openstackclient/tests/test_shell.py
+++ b/openstackclient/tests/test_shell.py
@@ -41,17 +41,17 @@ DEFAULT_SERVICE_URL = "http://127.0.0.1:8771/v3.0/"
 DEFAULT_AUTH_PLUGIN = "v2password"
 DEFAULT_INTERFACE = "internal"
 
-DEFAULT_COMPUTE_API_VERSION = "2"
-DEFAULT_IDENTITY_API_VERSION = "2"
-DEFAULT_IMAGE_API_VERSION = "2"
-DEFAULT_VOLUME_API_VERSION = "1"
-DEFAULT_NETWORK_API_VERSION = "2"
+DEFAULT_COMPUTE_API_VERSION = ""
+DEFAULT_IDENTITY_API_VERSION = ""
+DEFAULT_IMAGE_API_VERSION = ""
+DEFAULT_VOLUME_API_VERSION = ""
+DEFAULT_NETWORK_API_VERSION = ""
 
-LIB_COMPUTE_API_VERSION = "2"
-LIB_IDENTITY_API_VERSION = "2"
-LIB_IMAGE_API_VERSION = "1"
-LIB_VOLUME_API_VERSION = "1"
-LIB_NETWORK_API_VERSION = "2"
+LIB_COMPUTE_API_VERSION = ""
+LIB_IDENTITY_API_VERSION = ""
+LIB_IMAGE_API_VERSION = ""
+LIB_VOLUME_API_VERSION = ""
+LIB_NETWORK_API_VERSION = ""
 
 CLOUD_1 = {
     'clouds': {
@@ -203,7 +203,9 @@ class TestShell(utils.TestCase):
         initialize_app().
         """
 
-        self.occ_get_one = mock.Mock("Test Shell")
+        cloud = mock.Mock(name="cloudy")
+        cloud.config = {}
+        self.occ_get_one = mock.Mock(return_value=cloud)
         with mock.patch(
                 "os_client_config.config.OpenStackConfig.get_one_cloud",
                 self.occ_get_one,