diff --git a/functional/tests/volume/v2/test_qos.py b/functional/tests/volume/v2/test_qos.py
new file mode 100644
index 0000000000..24ce1b326a
--- /dev/null
+++ b/functional/tests/volume/v2/test_qos.py
@@ -0,0 +1,61 @@
+#    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.
+
+import uuid
+
+from functional.common import test
+
+
+class VolumeTests(test.TestCase):
+    """Functional tests for volume qos. """
+
+    NAME = uuid.uuid4().hex
+    HEADERS = ['Name']
+    FIELDS = ['id', 'name']
+    ID = None
+
+    @classmethod
+    def setUpClass(cls):
+        opts = cls.get_show_opts(cls.FIELDS)
+        raw_output = cls.openstack('volume qos create ' + cls.NAME + opts)
+        cls.ID, name, rol = raw_output.split('\n')
+        cls.assertOutput(cls.NAME, name)
+
+    @classmethod
+    def tearDownClass(cls):
+        raw_output = cls.openstack('volume qos delete ' + cls.ID)
+        cls.assertOutput('', raw_output)
+
+    def test_volume_qos_list(self):
+        opts = self.get_list_opts(self.HEADERS)
+        raw_output = self.openstack('volume qos list' + opts)
+        self.assertIn(self.NAME, raw_output)
+
+    def test_volume_qos_show(self):
+        opts = self.get_show_opts(self.FIELDS)
+        raw_output = self.openstack('volume qos show ' + self.ID + opts)
+        self.assertEqual(self.ID + "\n" + self.NAME + "\n", raw_output)
+
+    def test_volume_qos_metadata(self):
+        raw_output = self.openstack(
+            'volume qos set --property a=b --property c=d ' + self.ID)
+        self.assertEqual("", raw_output)
+        opts = self.get_show_opts(['name', 'specs'])
+        raw_output = self.openstack('volume qos show ' + self.ID + opts)
+        self.assertEqual(self.NAME + "\na='b', c='d'\n", raw_output)
+
+        raw_output = self.openstack(
+            'volume qos unset --property a ' + self.ID)
+        self.assertEqual("", raw_output)
+        opts = self.get_show_opts(['name', 'specs'])
+        raw_output = self.openstack('volume qos show ' + self.ID + opts)
+        self.assertEqual(self.NAME + "\nc='d'\n", raw_output)
diff --git a/functional/tests/volume/v2/test_volume_type.py b/functional/tests/volume/v2/test_volume_type.py
new file mode 100644
index 0000000000..d8a7a7eb39
--- /dev/null
+++ b/functional/tests/volume/v2/test_volume_type.py
@@ -0,0 +1,70 @@
+#    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.
+
+import uuid
+
+from functional.common import test
+
+
+class VolumeTypeTests(test.TestCase):
+    """Functional tests for volume type. """
+
+    NAME = uuid.uuid4().hex
+    HEADERS = ['"Name"']
+    FIELDS = ['name']
+
+    @classmethod
+    def setUpClass(cls):
+        opts = cls.get_show_opts(cls.FIELDS)
+        raw_output = cls.openstack(
+            'volume type create --private ' + cls.NAME + opts)
+        expected = cls.NAME + '\n'
+        cls.assertOutput(expected, raw_output)
+
+    @classmethod
+    def tearDownClass(cls):
+        raw_output = cls.openstack('volume type delete ' + cls.NAME)
+        cls.assertOutput('', raw_output)
+
+    def test_volume_type_list(self):
+        opts = self.get_list_opts(self.HEADERS)
+        raw_output = self.openstack('volume type list' + opts)
+        self.assertIn(self.NAME, raw_output)
+
+    def test_volume_type_show(self):
+        opts = self.get_show_opts(self.FIELDS)
+        raw_output = self.openstack('volume type show ' + self.NAME + opts)
+        self.assertEqual(self.NAME + "\n", raw_output)
+
+    def test_volume_type_set_unset_properties(self):
+        raw_output = self.openstack(
+            'volume type set --property a=b --property c=d ' + self.NAME)
+        self.assertEqual("", raw_output)
+
+        opts = self.get_show_opts(["properties"])
+        raw_output = self.openstack('volume type show ' + self.NAME + opts)
+        self.assertEqual("a='b', c='d'\n", raw_output)
+
+        raw_output = self.openstack('volume type unset --property a '
+                                    + self.NAME)
+        self.assertEqual("", raw_output)
+        raw_output = self.openstack('volume type show ' + self.NAME + opts)
+        self.assertEqual("c='d'\n", raw_output)
+
+    def test_volume_type_set_unset_project(self):
+        raw_output = self.openstack(
+            'volume type set --project admin ' + self.NAME)
+        self.assertEqual("", raw_output)
+
+        raw_output = self.openstack(
+            'volume type unset --project admin ' + self.NAME)
+        self.assertEqual("", raw_output)