1 files changed, 29 insertions, 34 deletions
diff --git a/openstackclient/tests/functional/image/v1/test_image.py b/openstackclient/tests/functional/image/v1/test_image.py
index b9774ab5..2b4d8f41 100644
--- a/openstackclient/tests/functional/image/v1/test_image.py
+++ b/openstackclient/tests/functional/image/v1/test_image.py
@@ -10,7 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
 import uuid
 
 import fixtures
@@ -22,41 +21,37 @@ class ImageTests(base.BaseImageTests):
     """Functional tests for Image commands"""
 
     def setUp(self):
-        super(ImageTests, self).setUp()
+        super().setUp()
+
         if not self.haz_v1_api:
             self.skipTest('No Image v1 API present')
 
-        self.name = uuid.uuid4().hex
-        json_output = json.loads(self.openstack(
-            '--os-image-api-version 1 '
-            'image create -f json ' +
-            self.name
-        ))
-        self.image_id = json_output["id"]
-        self.assertOutput(self.name, json_output['name'])
-
         ver_fixture = fixtures.EnvironmentVariable(
             'OS_IMAGE_API_VERSION', '1'
         )
         self.useFixture(ver_fixture)
 
+        self.name = uuid.uuid4().hex
+        output = self.openstack(
+            'image create ' + self.name,
+            parse_output=True,
+        )
+        self.image_id = output["id"]
+        self.assertOutput(self.name, output['name'])
+
     def tearDown(self):
         try:
-            self.openstack(
-                '--os-image-api-version 1 '
-                'image delete ' +
-                self.image_id
-            )
+            self.openstack('image delete ' + self.image_id)
         finally:
-            super(ImageTests, self).tearDown()
+            super().tearDown()
 
     def test_image_list(self):
-        json_output = json.loads(self.openstack(
-            'image list -f json '
-        ))
+        output = self.openstack(
+            'image list'
+        )
         self.assertIn(
             self.name,
-            [img['Name'] for img in json_output]
+            [img['Name'] for img in output]
         )
 
     def test_image_attributes(self):
@@ -71,24 +66,24 @@ class ImageTests(base.BaseImageTests):
             '--public ' +
             self.name
         )
-        json_output = json.loads(self.openstack(
-            'image show -f json ' +
-            self.name
-        ))
+        output = self.openstack(
+            'image show ' + self.name,
+            parse_output=True,
+        )
         self.assertEqual(
             4,
-            json_output["min_disk"],
+            output["min_disk"],
         )
         self.assertEqual(
             5,
-            json_output["min_ram"],
+            output["min_ram"],
         )
         self.assertEqual(
             'qcow2',
-            json_output['disk_format'],
+            output['disk_format'],
         )
         self.assertTrue(
-            json_output["is_public"],
+            output["is_public"],
         )
 
         # Test properties
@@ -99,11 +94,11 @@ class ImageTests(base.BaseImageTests):
             '--public ' +
             self.name
         )
-        json_output = json.loads(self.openstack(
-            'image show -f json ' +
-            self.name
-        ))
+        output = self.openstack(
+            'image show ' + self.name,
+            parse_output=True,
+        )
         self.assertEqual(
             {'a': 'b', 'c': 'd'},
-            json_output["properties"],
+            output["properties"],
         )