diff --git a/zaza/openstack/charm_tests/cinder_netapp/__init__.py b/zaza/openstack/charm_tests/cinder_netapp/__init__.py
new file mode 100644
index 0000000..31c5165
--- /dev/null
+++ b/zaza/openstack/charm_tests/cinder_netapp/__init__.py
@@ -0,0 +1,15 @@
+# Copyright 2021 Canonical Ltd.
+#
+# 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.
+
+"""Collection of code for setting up and testing cinder-netapp."""
diff --git a/zaza/openstack/charm_tests/cinder_netapp/tests.py b/zaza/openstack/charm_tests/cinder_netapp/tests.py
new file mode 100644
index 0000000..ef6cff9
--- /dev/null
+++ b/zaza/openstack/charm_tests/cinder_netapp/tests.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+
+# Copyright 2021 Canonical Ltd.
+#
+# 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.
+
+"""Encapsulate cinder-netapp testing."""
+
+import logging
+import uuid
+
+import zaza.model
+import zaza.openstack.charm_tests.test_utils as test_utils
+import zaza.openstack.utilities.openstack as openstack_utils
+
+
+class CindernetappTest(test_utils.OpenStackBaseTest):
+    """Encapsulate netapp tests."""
+
+    @classmethod
+    def setUpClass(cls):
+        """Run class setup for running tests."""
+        super(CindernetappTest, cls).setUpClass()
+        cls.keystone_session = openstack_utils.get_overcloud_keystone_session()
+        cls.model_name = zaza.model.get_juju_model()
+        cls.cinder_client = openstack_utils.get_cinder_session_client(
+            cls.keystone_session)
+
+    def test_cinder_config(self):
+        """Test that configuration options match our expectations."""
+        logging.info('cinder-netapp')
+        expected_contents = {
+            'cinder-netapp': {
+                'netapp_storage_family': ['ontap_cluster'],
+                'netapp_storage_protocol': ['iscsi'],
+                'volume_backend_name': ['cinder_netapp'],
+                'volume_driver':
+                ['cinder.volume.drivers.netapp.common.NetAppDriver'],
+            }}
+
+        zaza.model.run_on_leader(
+            'cinder',
+            'sudo cp /etc/cinder/cinder.conf /tmp/')
+        zaza.model.block_until_oslo_config_entries_match(
+            'cinder',
+            '/tmp/cinder.conf',
+            expected_contents,
+            timeout=2)
+
+    def test_create_volume(self):
+        """Test creating a volume with basic configuration."""
+        test_vol_name = "zaza{}".format(uuid.uuid1().fields[0])
+        vol_new = self.cinder_client.volumes.create(
+            name=test_vol_name,
+            size='1')
+        openstack_utils.resource_reaches_status(
+            self.cinder_client.volumes,
+            vol_new.id,
+            wait_iteration_max_time=12000,
+            stop_after_attempt=5,
+            expected_status='available',
+            msg='Volume status wait')
+        test_vol = self.cinder_client.volumes.find(name=test_vol_name)
+        self.assertEqual(
+            getattr(test_vol, 'os-vol-host-attr:host').split('#')[0],
+            'cinder@cinder-netapp')
+        self.cinder_client.volumes.delete(vol_new)