diff --git a/shade/tests/functional/test_flavor.py b/shade/tests/functional/test_flavor.py
new file mode 100644
index 000000000..91507a8ec
--- /dev/null
+++ b/shade/tests/functional/test_flavor.py
@@ -0,0 +1,98 @@
+# Copyright (c) 2015 Hewlett-Packard Development Company, L.P.
+#
+# 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.
+
+"""
+test_flavor
+----------------------------------
+
+Functional tests for `shade` flavor resource.
+"""
+
+import string
+import random
+
+import shade
+from shade.exc import OpenStackCloudException
+from shade.tests import base
+
+
+class TestFlavor(base.TestCase):
+
+    def setUp(self):
+        super(TestFlavor, self).setUp()
+        # Shell should have OS-* envvars from openrc, typically loaded by job
+        self.operator_cloud = shade.operator_cloud()
+
+        # Generate a random name for flavors in this test
+        self.new_item_name = 'flavor_' + ''.join(
+            random.choice(string.ascii_lowercase) for _ in range(5))
+
+        self.addCleanup(self._cleanup_flavors)
+
+    def _cleanup_flavors(self):
+        exception_list = list()
+        for f in self.operator_cloud.list_flavors():
+            if f['name'].startswith(self.new_item_name):
+                try:
+                    self.operator_cloud.delete_flavor(f['id'])
+                except Exception as e:
+                    # We were unable to delete a flavor, let's try with next
+                    exception_list.append(e)
+                    continue
+        if exception_list:
+            # Raise an error: we must make users aware that something went
+            # wrong
+            raise OpenStackCloudException('\n'.join(exception_list))
+
+    def test_create_flavor(self):
+        flavor_name = self.new_item_name + '_create'
+        flavor_kwargs = dict(
+            name=flavor_name, ram=1024, vcpus=2, disk=10, ephemeral=5,
+            swap=100, rxtx_factor=1.5, is_public=True
+        )
+
+        flavor = self.operator_cloud.create_flavor(**flavor_kwargs)
+
+        self.assertIsNotNone(flavor['id'])
+        for key in flavor_kwargs.keys():
+            self.assertIn(key, flavor)
+        for key, value in flavor_kwargs.items():
+            self.assertEqual(value, flavor[key])
+
+    def test_list_flavors(self):
+        pub_flavor_name = self.new_item_name + '_public'
+        priv_flavor_name = self.new_item_name + '_private'
+        public_kwargs = dict(
+            name=pub_flavor_name, ram=1024, vcpus=2, disk=10, is_public=True
+        )
+        private_kwargs = dict(
+            name=priv_flavor_name, ram=1024, vcpus=2, disk=10, is_public=True
+        )
+
+        # Create a public and private flavor. We expect both to be listed
+        # for an operator.
+        self.operator_cloud.create_flavor(**public_kwargs)
+        self.operator_cloud.create_flavor(**private_kwargs)
+
+        flavors = self.operator_cloud.list_flavors()
+
+        # Flavor list will include the standard devstack flavors. We just want
+        # to make sure both of the flavors we just created are present.
+        found = []
+        for f in flavors:
+            if f['name'] in (pub_flavor_name, priv_flavor_name):
+                found.append(f)
+        self.assertEqual(2, len(found))