diff --git a/novaclient/__init__.py b/novaclient/__init__.py
index 1a2ae922e..d0859b114 100644
--- a/novaclient/__init__.py
+++ b/novaclient/__init__.py
@@ -25,4 +25,4 @@ API_MIN_VERSION = api_versions.APIVersion("2.1")
 # when client supported the max version, and bumped sequentially, otherwise
 # the client may break due to server side new version may include some
 # backward incompatible change.
-API_MAX_VERSION = api_versions.APIVersion("2.17")
+API_MAX_VERSION = api_versions.APIVersion("2.18")
diff --git a/novaclient/tests/unit/v2/test_shell.py b/novaclient/tests/unit/v2/test_shell.py
index 0869a1105..8e110c578 100644
--- a/novaclient/tests/unit/v2/test_shell.py
+++ b/novaclient/tests/unit/v2/test_shell.py
@@ -2677,6 +2677,14 @@ class ShellTest(utils.TestCase):
             9,   # doesn't require any changes in novaclient
             15,  # doesn't require any changes in novaclient
             16,  # doesn't require any changes in novaclient
+            18,  # NOTE(andreykurilin): this microversion requires changes in
+                 #   HttpClient and our SessionClient, which is based on
+                 #   keystoneauth1.session. Skipping this complicated change
+                 #   allows to unblock implementation further microversions
+                 #   before feature-freeze
+                 #   (we can do it, since nova-api change didn't actually add
+                 #   new microversion, just an additional checks. See
+                 #   https://review.openstack.org/#/c/233076/ for more details)
         ])
         versions_supported = set(range(0,
                                  novaclient.API_MAX_VERSION.ver_minor + 1))