diff --git a/shade/tests/functional/test_image.py b/shade/tests/functional/test_image.py
index 89c760a04..8c630a4e7 100644
--- a/shade/tests/functional/test_image.py
+++ b/shade/tests/functional/test_image.py
@@ -20,7 +20,6 @@ Functional tests for `shade` image methods.
 """
 
 import tempfile
-import uuid
 
 from shade import openstack_cloud
 from shade.tests import base
@@ -37,7 +36,7 @@ class TestImage(base.TestCase):
         test_image = tempfile.NamedTemporaryFile(delete=False)
         test_image.write('\0' * 1024 * 1024)
         test_image.close()
-        image_name = 'test-image-%s' % uuid.uuid4()
+        image_name = self.getUniqueString('image')
         try:
             self.cloud.create_image(name=image_name,
                                     filename=test_image.name,
diff --git a/shade/tests/functional/test_object.py b/shade/tests/functional/test_object.py
index 736d69135..e2818238e 100644
--- a/shade/tests/functional/test_object.py
+++ b/shade/tests/functional/test_object.py
@@ -20,7 +20,6 @@ Functional tests for `shade` object methods.
 """
 
 import tempfile
-import uuid
 
 from testtools import content
 
@@ -38,7 +37,7 @@ class TestObject(base.TestCase):
 
     def test_create_object(self):
         '''Test uploading small and large files.'''
-        container_name = str(uuid.uuid4())
+        container_name = self.getUniqueString('container')
         self.addDetail('container', content.text_content(container_name))
         self.addCleanup(self.cloud.delete_container, container_name)
         self.cloud.create_container(container_name)