diff --git a/cinder/tests/unit/volume/drivers/test_nimble.py b/cinder/tests/unit/volume/drivers/test_nimble.py
index 3b9e2eb6314..ac5bba64cae 100644
--- a/cinder/tests/unit/volume/drivers/test_nimble.py
+++ b/cinder/tests/unit/volume/drivers/test_nimble.py
@@ -15,8 +15,8 @@
 
 
 import sys
+from unittest import mock
 
-import mock
 from six.moves import http_client
 
 from cinder import context
diff --git a/cinder/volume/drivers/nimble.py b/cinder/volume/drivers/nimble.py
index cbcbac22dcd..c36850c68a3 100644
--- a/cinder/volume/drivers/nimble.py
+++ b/cinder/volume/drivers/nimble.py
@@ -138,9 +138,6 @@ class NimbleBaseVolumeDriver(san.SanDriver):
     # ThirdPartySystems wiki page
     CI_WIKI_NAME = "Nimble_Storage_CI"
 
-    # TODO(jsbryant) Remove driver in the 'U' release if CI is not fixed.
-    SUPPORTED = False
-
     def __init__(self, *args, **kwargs):
         super(NimbleBaseVolumeDriver, self).__init__(*args, **kwargs)
         self.APIExecutor = None
diff --git a/doc/source/reference/support-matrix.ini b/doc/source/reference/support-matrix.ini
index 301d90d2fee..2c7cc264128 100644
--- a/doc/source/reference/support-matrix.ini
+++ b/doc/source/reference/support-matrix.ini
@@ -233,7 +233,7 @@ driver.netapp_ontap=complete
 driver.netapp_solidfire=complete
 driver.nexenta=complete
 driver.nfs=complete
-driver.nimble=missing
+driver.nimble=complete
 driver.prophetstor=missing
 driver.pure=complete
 driver.qnap=complete
diff --git a/releasenotes/notes/nimble-mark-supported-0c8e5e21c8d1179d.yaml b/releasenotes/notes/nimble-mark-supported-0c8e5e21c8d1179d.yaml
new file mode 100644
index 00000000000..a912e8f2c4b
--- /dev/null
+++ b/releasenotes/notes/nimble-mark-supported-0c8e5e21c8d1179d.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    HPE Nimble Storage drivers had been previously marked unsupported. Testing
+    requirements have been addressed and they are now fully supported again.
+    HPE Nimble Storage drivers allow cinder to manage volumes both in iSCSI and
+    FC environment.