diff --git a/doc/source/devref/hp_3par_driver.rst b/doc/source/devref/hp_3par_driver.rst
index 61aec141..afbc9a04 100644
--- a/doc/source/devref/hp_3par_driver.rst
+++ b/doc/source/devref/hp_3par_driver.rst
@@ -88,8 +88,6 @@ file for the HP 3PAR driver:
 - `hp3par_share_ip_address` = <IP address to use for share export location>
 - `hp3par_san_ip` = <IP address for SSH access to the SAN controller>
 - `hp3par_api_url` = <3PAR WS API Server URL>
-- `hp3par_username` = <3PAR superuser username>
-- `hp3par_password` = <3PAR superuser password>
 - `hp3par_san_login` = <Username for SSH access to the SAN controller>
 - `hp3par_san_password` = <Password for SSH access to the SAN controller>
 - `hp3par_debug` = <False or True for extra debug logging>
diff --git a/manila/share/drivers/hp/hp_3par_driver.py b/manila/share/drivers/hp/hp_3par_driver.py
index bbd69852..2b7570ea 100644
--- a/manila/share/drivers/hp/hp_3par_driver.py
+++ b/manila/share/drivers/hp/hp_3par_driver.py
@@ -34,13 +34,6 @@ HP3PAR_OPTS = [
                default='',
                help="3PAR WSAPI Server Url like "
                     "https://<3par ip>:8080/api/v1"),
-    cfg.StrOpt('hp3par_username',
-               default='',
-               help="3PAR Super user username"),
-    cfg.StrOpt('hp3par_password',
-               default='',
-               help="3PAR Super user password",
-               secret=True),
     cfg.StrOpt('hp3par_san_ip',
                default='',
                help="IP address of SAN controller"),
@@ -107,8 +100,6 @@ class HP3ParShareDriver(driver.ShareDriver):
                   "hp3par_share_ip_address is not set."))
 
         mediator = hp_3par_mediator.HP3ParMediator(
-            hp3par_username=self.configuration.hp3par_username,
-            hp3par_password=self.configuration.hp3par_password,
             hp3par_api_url=self.configuration.hp3par_api_url,
             hp3par_debug=self.configuration.hp3par_debug,
             hp3par_san_ip=self.configuration.hp3par_san_ip,
diff --git a/manila/share/drivers/hp/hp_3par_mediator.py b/manila/share/drivers/hp/hp_3par_mediator.py
index 4458c970..dd11eed3 100644
--- a/manila/share/drivers/hp/hp_3par_mediator.py
+++ b/manila/share/drivers/hp/hp_3par_mediator.py
@@ -44,8 +44,6 @@ class HP3ParMediator(object):
 
     def __init__(self, **kwargs):
 
-        self.hp3par_username = kwargs.get('hp3par_username')
-        self.hp3par_password = kwargs.get('hp3par_password')
         self.hp3par_api_url = kwargs.get('hp3par_api_url')
         self.hp3par_debug = kwargs.get('hp3par_debug')
         self.hp3par_san_ip = kwargs.get('hp3par_san_ip')
diff --git a/manila/tests/share/drivers/hp/test_hp_3par_driver.py b/manila/tests/share/drivers/hp/test_hp_3par_driver.py
index ef700a46..acf5e129 100644
--- a/manila/tests/share/drivers/hp/test_hp_3par_driver.py
+++ b/manila/tests/share/drivers/hp/test_hp_3par_driver.py
@@ -34,8 +34,6 @@ class HP3ParDriverTestCase(test.TestCase):
         self.conf = mock.Mock()
         self.conf.driver_handles_share_servers = False
         self.conf.hp3par_debug = constants.EXPECTED_HP_DEBUG
-        self.conf.hp3par_username = constants.USERNAME
-        self.conf.hp3par_password = constants.PASSWORD
         self.conf.hp3par_api_url = constants.API_URL
         self.conf.hp3par_san_login = constants.SAN_LOGIN
         self.conf.hp3par_san_password = constants.SAN_PASSWORD
@@ -72,11 +70,9 @@ class HP3ParDriverTestCase(test.TestCase):
         self.mock_mediator_constructor.assert_has_calls([
             mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
                       hp3par_san_password=conf.hp3par_san_password,
-                      hp3par_username=conf.hp3par_username,
                       hp3par_san_login=conf.hp3par_san_login,
                       hp3par_debug=conf.hp3par_debug,
                       hp3par_api_url=conf.hp3par_api_url,
-                      hp3par_password=conf.hp3par_password,
                       hp3par_san_ip=conf.hp3par_san_ip,
                       hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
                       ssh_conn_timeout=conf.ssh_conn_timeout)])
@@ -100,11 +96,9 @@ class HP3ParDriverTestCase(test.TestCase):
         self.mock_mediator_constructor.assert_has_calls([
             mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
                       hp3par_san_password=conf.hp3par_san_password,
-                      hp3par_username=conf.hp3par_username,
                       hp3par_san_login=conf.hp3par_san_login,
                       hp3par_debug=conf.hp3par_debug,
                       hp3par_api_url=conf.hp3par_api_url,
-                      hp3par_password=conf.hp3par_password,
                       hp3par_san_ip=conf.hp3par_san_ip,
                       hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
                       ssh_conn_timeout=conf.ssh_conn_timeout)])
@@ -124,11 +118,9 @@ class HP3ParDriverTestCase(test.TestCase):
         self.mock_mediator_constructor.assert_has_calls([
             mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
                       hp3par_san_password=conf.hp3par_san_password,
-                      hp3par_username=conf.hp3par_username,
                       hp3par_san_login=conf.hp3par_san_login,
                       hp3par_debug=conf.hp3par_debug,
                       hp3par_api_url=conf.hp3par_api_url,
-                      hp3par_password=conf.hp3par_password,
                       hp3par_san_ip=conf.hp3par_san_ip,
                       hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
                       ssh_conn_timeout=conf.ssh_conn_timeout)])
diff --git a/manila/tests/share/drivers/hp/test_hp_3par_mediator.py b/manila/tests/share/drivers/hp/test_hp_3par_mediator.py
index 05345dae..8b9d47af 100644
--- a/manila/tests/share/drivers/hp/test_hp_3par_mediator.py
+++ b/manila/tests/share/drivers/hp/test_hp_3par_mediator.py
@@ -53,8 +53,6 @@ class HP3ParMediatorTestCase(test.TestCase):
 
         # Set the mediator to use in tests.
         self.mediator = hp3parmediator.HP3ParMediator(
-            hp3par_username=constants.USERNAME,
-            hp3par_password=constants.PASSWORD,
             hp3par_api_url=constants.API_URL,
             hp3par_debug=constants.EXPECTED_HP_DEBUG,
             hp3par_san_ip=constants.EXPECTED_IP_1234,