diff --git a/components/tools/OmeroPy/test/integration/clitest/test_metadata.py b/components/tools/OmeroPy/test/integration/clitest/test_metadata.py
index 59f3a3355bc..79df8114ccf 100644
--- a/components/tools/OmeroPy/test/integration/clitest/test_metadata.py
+++ b/components/tools/OmeroPy/test/integration/clitest/test_metadata.py
@@ -28,7 +28,7 @@
 from omero.gateway import BlitzGateway
 with warnings.catch_warnings():
     warnings.simplefilter("ignore")
-    from omero.plugins.metadata import Metadata, MetadataControl
+    from omero.plugins._metadata_deprecated import Metadata, MetadataControl
 from omero.rtypes import rdouble, unwrap
 from omero.testlib.cli import CLITest
 from omero.model.enums import UnitsLength
diff --git a/components/tools/OmeroPy/test/integration/clitest/test_upload.py b/components/tools/OmeroPy/test/integration/clitest/test_upload.py
index c8ce357cbfe..96e37d394ca 100644
--- a/components/tools/OmeroPy/test/integration/clitest/test_upload.py
+++ b/components/tools/OmeroPy/test/integration/clitest/test_upload.py
@@ -28,7 +28,7 @@
 from omero.plugins.obj import ObjControl
 with warnings.catch_warnings():
     warnings.simplefilter("ignore")
-    from omero.plugins.upload import UploadControl
+    from omero.plugins._upload_deprecated import UploadControl
 from omero.util.temp_files import create_path