diff --git a/launch/test/legacy/launch_counter.py b/launch/test/legacy/launch_counter.py
index cf4a037a7..2d8781eed 100644
--- a/launch/test/legacy/launch_counter.py
+++ b/launch/test/legacy/launch_counter.py
@@ -16,8 +16,8 @@
 import sys
 from tempfile import NamedTemporaryFile
 
-from launch.exit_handler import ignore_exit_handler
-from launch.output_handler import FileOutput
+from launch.legacy.exit_handler import ignore_exit_handler
+from launch.legacy.output_handler import FileOutput
 
 
 def launch(launch_descriptor, argv):
diff --git a/launch/test/legacy/launch_multiple_counters.py b/launch/test/legacy/launch_multiple_counters.py
index 41b4fb738..e2778bf76 100644
--- a/launch/test/legacy/launch_multiple_counters.py
+++ b/launch/test/legacy/launch_multiple_counters.py
@@ -16,12 +16,12 @@
 import sys
 from tempfile import NamedTemporaryFile
 
-from launch import LaunchDescriptor
-from launch.exit_handler import ignore_exit_handler
-from launch.exit_handler import restart_exit_handler
-from launch.loader import load_launch_file
-from launch.output_handler import ConsoleOutput
-from launch.output_handler import FileOutput
+from launch.legacy import LaunchDescriptor
+from launch.legacy.exit_handler import ignore_exit_handler
+from launch.legacy.exit_handler import restart_exit_handler
+from launch.legacy.loader import load_launch_file
+from launch.legacy.output_handler import ConsoleOutput
+from launch.legacy.output_handler import FileOutput
 
 
 def launch(launch_descriptor, argv):
diff --git a/launch/test/legacy/test_interrupt_default_launcher.py b/launch/test/legacy/test_interrupt_default_launcher.py
index 4e936489a..539b3eb86 100644
--- a/launch/test/legacy/test_interrupt_default_launcher.py
+++ b/launch/test/legacy/test_interrupt_default_launcher.py
@@ -16,8 +16,8 @@
 import sys
 import threading
 
-from launch import LaunchDescriptor
-from launch.launcher import DefaultLauncher
+from launch.legacy import LaunchDescriptor
+from launch.legacy.launcher import DefaultLauncher
 
 
 def test_interrupt_default_launcher():
diff --git a/launch/test/legacy/test_launch_args.py b/launch/test/legacy/test_launch_args.py
index 016a7c947..08d6458d1 100644
--- a/launch/test/legacy/test_launch_args.py
+++ b/launch/test/legacy/test_launch_args.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from launch.arguments import get_launch_args
+from launch.legacy.arguments import get_launch_args
 
 
 def test_launch_args():
diff --git a/launch/test/legacy/test_launch_with_coroutine.py b/launch/test/legacy/test_launch_with_coroutine.py
index 0c0a8c646..7c1dceaee 100644
--- a/launch/test/legacy/test_launch_with_coroutine.py
+++ b/launch/test/legacy/test_launch_with_coroutine.py
@@ -16,10 +16,10 @@
 import os
 import sys
 
-from launch import LaunchDescriptor
-from launch.exit_handler import primary_exit_handler
-from launch.launcher import DefaultLauncher
-from launch.loader import load_launch_file
+from launch.legacy import LaunchDescriptor
+from launch.legacy.exit_handler import primary_exit_handler
+from launch.legacy.launcher import DefaultLauncher
+from launch.legacy.loader import load_launch_file
 
 
 def test_launch_with_coroutine():
diff --git a/launch/test/legacy/test_multiple_launch.py b/launch/test/legacy/test_multiple_launch.py
index 22bff25b7..9d72a84ba 100644
--- a/launch/test/legacy/test_multiple_launch.py
+++ b/launch/test/legacy/test_multiple_launch.py
@@ -15,8 +15,8 @@
 import asyncio
 import sys
 
-from launch import LaunchDescriptor
-from launch.launcher import DefaultLauncher
+from launch.legacy import LaunchDescriptor
+from launch.legacy.launcher import DefaultLauncher
 
 
 def test_multiple_launch():
diff --git a/launch/test/legacy/test_non_primary_return_code.py b/launch/test/legacy/test_non_primary_return_code.py
index f047e3a07..815b1230c 100644
--- a/launch/test/legacy/test_non_primary_return_code.py
+++ b/launch/test/legacy/test_non_primary_return_code.py
@@ -16,9 +16,9 @@
 import os
 import sys
 
-from launch import LaunchDescriptor
-from launch.exit_handler import primary_exit_handler
-from launch.launcher import DefaultLauncher
+from launch.legacy import LaunchDescriptor
+from launch.legacy.exit_handler import primary_exit_handler
+from launch.legacy.launcher import DefaultLauncher
 
 
 def test_non_primary_return_code():
diff --git a/launch_testing/launch_testing/__init__.py b/launch_testing/launch_testing/__init__.py
index 75b2a52ca..e9c46ba6e 100644
--- a/launch_testing/launch_testing/__init__.py
+++ b/launch_testing/launch_testing/__init__.py
@@ -6,7 +6,7 @@
 import sys
 
 import ament_index_python
-from launch.output_handler import LineOutput
+from launch.legacy.output_handler import LineOutput
 
 
 class UnmatchedOutputError(BaseException):
diff --git a/launch_testing/test/test_env_passing.py b/launch_testing/test/test_env_passing.py
index 5a100955d..a37716826 100644
--- a/launch_testing/test/test_env_passing.py
+++ b/launch_testing/test/test_env_passing.py
@@ -16,9 +16,9 @@
 import os
 import sys
 
-from launch import LaunchDescriptor
-from launch.exit_handler import primary_exit_handler
-from launch.launcher import DefaultLauncher
+from launch.legacy import LaunchDescriptor
+from launch.legacy.exit_handler import primary_exit_handler
+from launch.legacy.launcher import DefaultLauncher
 
 
 def test_env():
diff --git a/launch_testing/test/test_matching.py b/launch_testing/test/test_matching.py
index 0f89bc05f..68a6eb427 100644
--- a/launch_testing/test/test_matching.py
+++ b/launch_testing/test/test_matching.py
@@ -16,9 +16,9 @@
 import sys
 import tempfile
 
-from launch import LaunchDescriptor
-from launch.exit_handler import ignore_exit_handler
-from launch.launcher import DefaultLauncher
+from launch.legacy import LaunchDescriptor
+from launch.legacy.exit_handler import ignore_exit_handler
+from launch.legacy.launcher import DefaultLauncher
 from launch_testing import create_handler