diff --git a/functional/tests/compute/v2/test_flavor.py b/functional/tests/compute/v2/test_flavor.py
index 1ce2abd7ac..becf217f6c 100644
--- a/functional/tests/compute/v2/test_flavor.py
+++ b/functional/tests/compute/v2/test_flavor.py
@@ -44,3 +44,13 @@ class FlavorTests(test.TestCase):
         opts = self.get_show_opts(self.FIELDS)
         raw_output = self.openstack('flavor show ' + self.NAME + opts)
         self.assertEqual(self.NAME + "\n", raw_output)
+
+    def test_flavor_properties(self):
+        opts = self.get_show_opts(["properties"])
+        raw_output = self.openstack(
+            'flavor set --property a=b --property c=d ' + self.NAME + opts)
+        self.assertEqual("a='b', c='d'\n", raw_output)
+
+        raw_output = self.openstack('flavor unset --property a ' +
+                                    self.NAME + opts)
+        self.assertEqual("c='d'\n", raw_output)