diff --git a/functional/common/test.py b/functional/common/test.py
index 7beaf39aa4..ef034276e4 100644
--- a/functional/common/test.py
+++ b/functional/common/test.py
@@ -56,7 +56,7 @@ class TestCase(testtools.TestCase):
 
     @classmethod
     def get_list_opts(cls, headers=[]):
-        opts = ' -f csv --quote none '
+        opts = ' -f csv '
         opts = opts + ' '.join(['-c ' + it for it in headers])
         return opts
 
diff --git a/functional/tests/image/__init__.py b/functional/tests/image/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/functional/tests/image/v1/__init__.py b/functional/tests/image/v1/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/functional/tests/image/v1/test_image.py b/functional/tests/image/v1/test_image.py
new file mode 100644
index 0000000000..e27ab24cd1
--- /dev/null
+++ b/functional/tests/image/v1/test_image.py
@@ -0,0 +1,45 @@
+#    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 ImageTests(test.TestCase):
+    """Functional tests for image. """
+
+    NAME = uuid.uuid4().hex
+    HEADERS = ['Name']
+    FIELDS = ['name']
+
+    @classmethod
+    def setUpClass(cls):
+        opts = cls.get_show_opts(cls.FIELDS)
+        raw_output = cls.openstack('image create ' + cls.NAME + opts)
+        expected = cls.NAME + '\n'
+        cls.assertOutput(expected, raw_output)
+
+    @classmethod
+    def tearDownClass(cls):
+        raw_output = cls.openstack('image delete ' + cls.NAME)
+        cls.assertOutput('', raw_output)
+
+    def test_image_list(self):
+        opts = self.get_list_opts(self.HEADERS)
+        raw_output = self.openstack('image list' + opts)
+        self.assertIn(self.NAME, raw_output)
+
+    def test_image_show(self):
+        opts = self.get_show_opts(self.FIELDS)
+        raw_output = self.openstack('image show ' + self.NAME + opts)
+        self.assertEqual(self.NAME + "\n", raw_output)
diff --git a/functional/tests/object/v1/test_container.py b/functional/tests/object/v1/test_container.py
index 9ea14cdec6..8721a4a79d 100644
--- a/functional/tests/object/v1/test_container.py
+++ b/functional/tests/object/v1/test_container.py
@@ -23,7 +23,7 @@ class ContainerTests(test.TestCase):
     def setUpClass(cls):
         opts = cls.get_list_opts(['container'])
         raw_output = cls.openstack('container create ' + cls.NAME + opts)
-        expected = 'container\n' + cls.NAME + '\n'
+        expected = '"container"\n"' + cls.NAME + '"\n'
         cls.assertOutput(expected, raw_output)
 
     @classmethod