diff --git a/tripleoclient/tests/v1/test_container_image.py b/tripleoclient/tests/v1/test_container_image.py
index 7db1e4c64..08623670e 100644
--- a/tripleoclient/tests/v1/test_container_image.py
+++ b/tripleoclient/tests/v1/test_container_image.py
@@ -26,24 +26,11 @@ import yaml
 
 from osc_lib import exceptions as oscexc
 from six.moves.urllib import parse
-from tripleo_common.image import image_uploader
 from tripleo_common.image import kolla_builder
 from tripleoclient import constants
 from tripleoclient.tests.v1.test_plugin import TestPluginV1
 from tripleoclient.v1 import container_image
 
-# TODO(sbaker) Remove after a tripleo-common release contains this attribute
-CLEANUP = (
-    CLEANUP_FULL, CLEANUP_PARTIAL, CLEANUP_NONE
-) = (
-    'full', 'partial', 'none'
-)
-if not hasattr(image_uploader, 'CLEANUP'):
-    setattr(image_uploader, 'CLEANUP', CLEANUP)
-    setattr(image_uploader, 'CLEANUP_FULL', CLEANUP_FULL)
-    setattr(image_uploader, 'CLEANUP_PARTIAL', CLEANUP_PARTIAL)
-    setattr(image_uploader, 'CLEANUP_NONE', CLEANUP_NONE)
-
 
 class TestContainerImageUpload(TestPluginV1):
 
diff --git a/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py b/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py
index edac05859..a5f5736c4 100644
--- a/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py
+++ b/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py
@@ -20,8 +20,6 @@ import tempfile
 import yaml
 
 from heatclient import exc as hc_exc
-from tripleo_common.image import kolla_builder
-
 from tripleoclient import exceptions
 from tripleoclient.tests import fakes
 from tripleoclient.tests.v1.test_plugin import TestPluginV1
@@ -32,11 +30,6 @@ from tripleoclient.v1 import tripleo_deploy
 import ansible_runner
 
 
-# TODO(sbaker) Remove after a tripleo-common release contains this new function
-if not hasattr(kolla_builder, 'container_images_prepare_multi'):
-    setattr(kolla_builder, 'container_images_prepare_multi', mock.Mock())
-
-
 class FakePluginV1Client(object):
     def __init__(self, **kwargs):
         self.auth_token = kwargs['token']