diff --git a/octavia_tempest_plugin/clients.py b/octavia_tempest_plugin/clients.py
index 9b35afd..c1894e3 100644
--- a/octavia_tempest_plugin/clients.py
+++ b/octavia_tempest_plugin/clients.py
@@ -35,6 +35,8 @@
     member_client)
 from octavia_tempest_plugin.services.load_balancer.v2 import (
     pool_client)
+from octavia_tempest_plugin.services.load_balancer.v2 import (
+    provider_client)
 
 CONF = config.CONF
 SERVICE_TYPE = 'load-balancer'
@@ -65,3 +67,5 @@
             self.auth_provider, SERVICE_TYPE, CONF.identity.region)
         self.flavor_client = flavor_client.FlavorClient(
             self.auth_provider, SERVICE_TYPE, CONF.identity.region)
+        self.provider_client = provider_client.ProviderClient(
+            self.auth_provider, SERVICE_TYPE, CONF.identity.region)
diff --git a/octavia_tempest_plugin/services/load_balancer/v2/provider_client.py b/octavia_tempest_plugin/services/load_balancer/v2/provider_client.py
new file mode 100644
index 0000000..cbef1df
--- /dev/null
+++ b/octavia_tempest_plugin/services/load_balancer/v2/provider_client.py
@@ -0,0 +1,61 @@
+#   Copyright 2019 Rackspace US Inc.  All rights reserved.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+from octavia_tempest_plugin.services.load_balancer.v2 import base_client
+
+Unset = base_client.Unset
+
+
+class ProviderClient(base_client.BaseLBaaSClient):
+
+    list_root_tag = 'providers'
+
+    def list_providers(self, query_params=None, return_object_only=True):
+        """Get a list of provider objects.
+
+        :param query_params: The optional query parameters to append to the
+                             request. Ex. fields=id&fields=name
+        :param return_object_only: If True, the response returns the object
+                                   inside the root tag. False returns the full
+                                   response from the API.
+        :raises AssertionError: if the expected_code isn't a valid http success
+                                response code
+        :raises BadRequest: If a 400 response code is received
+        :raises Conflict: If a 409 response code is received
+        :raises Forbidden: If a 403 response code is received
+        :raises Gone: If a 410 response code is received
+        :raises InvalidContentType: If a 415 response code is received
+        :raises InvalidHTTPResponseBody: The response body wasn't valid JSON
+        :raises InvalidHttpSuccessCode: if the read code isn't an expected
+                                        http success code
+        :raises NotFound: If a 404 response code is received
+        :raises NotImplemented: If a 501 response code is received
+        :raises OverLimit: If a 413 response code is received and over_limit is
+                           not in the response body
+        :raises RateLimitExceeded: If a 413 response code is received and
+                                   over_limit is in the response body
+        :raises ServerFault: If a 500 response code is received
+        :raises Unauthorized: If a 401 response code is received
+        :raises UnexpectedContentType: If the content-type of the response
+                                       isn't an expect type
+        :raises UnexpectedResponseCode: If a response code above 400 is
+                                        received and it doesn't fall into any
+                                        of the handled checks
+        :raises UnprocessableEntity: If a 422 response code is received and
+                                     couldn't be parsed
+        :returns: A list of provider objects.
+        """
+        return self._list_objects(query_params=query_params,
+                                  return_object_only=return_object_only)
