diff --git a/test/manual/workflows_scaling.py b/test/manual/workflows_scaling.py
index db8a8cac018f..35fe2929aa75 100644
--- a/test/manual/workflows_scaling.py
+++ b/test/manual/workflows_scaling.py
@@ -15,6 +15,7 @@
 from uuid import uuid4
 
 from bioblend import galaxy
+from gxformat2 import python_to_workflow
 
 galaxy_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir))
 sys.path[1:1] = [os.path.join(galaxy_root, "lib"), os.path.join(galaxy_root, "test")]
@@ -24,7 +25,6 @@
     GiDatasetPopulator,
     GiWorkflowPopulator,
 )
-from base.workflows_format_2.converter import python_to_workflow  # noqa: I100
 
 LONG_TIMEOUT = 1000000000
 DESCRIPTION = "Script to exercise the workflow engine."
diff --git a/test/selenium_tests/framework.py b/test/selenium_tests/framework.py
index 87569eda3ef3..d0166dcd8464 100644
--- a/test/selenium_tests/framework.py
+++ b/test/selenium_tests/framework.py
@@ -10,6 +10,10 @@
 from functools import partial, wraps
 
 import requests
+from gxformat2 import (
+    convert_and_import_workflow,
+    ImporterGalaxyInterface,
+)
 try:
     from pyvirtualdisplay import Display
 except ImportError:
@@ -20,10 +24,6 @@
 from base.api import UsesApiTestCaseMixin  # noqa: I100
 from base.driver_util import classproperty, DEFAULT_WEB_HOST, get_ip_address  # noqa: I100
 from base.testcase import FunctionalTestCase  # noqa: I100
-from base.workflows_format_2 import (  # noqa: I100
-    convert_and_import_workflow,
-    ImporterGalaxyInterface,
-)
 from galaxy_selenium import (  # noqa: I100,I201
     driver_factory,
 )