diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
index ee352f8a73..ba5bb8ffa4 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
@@ -58,7 +58,7 @@ def launch_and_validate_results(request, test_directory, editor, editor_script,
     if auto_test_mode:
         editor.args.extend(["--autotest_mode"])
     if null_renderer:
-        editor.args.extend(["-NullRenderer"])
+        editor.args.extend(["-rhi=null"])
 
     with editor.start():
 
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
index 848deeb522..e914f5e523 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
@@ -40,8 +40,8 @@ import azlmbr.render as render
 
 sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests"))
 
-import automatedtesting_shared.hydra_editor_utils as hydra
-from automatedtesting_shared.utils import TestHelper as helper
+import editor_python_test_tools.hydra_editor_utils as hydra
+from editor_python_test_tools.utils import TestHelper as helper
 
 
 class TestAllComponentsBasicTests(object):
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
index eb207c2f90..604e87e8a4 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
@@ -15,7 +15,7 @@ import pytest
 
 import ly_test_tools.environment.file_system as file_system
 
-import automatedtesting_shared.hydra_test_utils as hydra
+import editor_python_test_tools.hydra_test_utils as hydra
 
 logger = logging.getLogger(__name__)
 EDITOR_TIMEOUT = 60
@@ -210,7 +210,7 @@ class TestAtomEditorComponents(object):
             request,
             TEST_DIRECTORY,
             editor,
-            "hydra_AtomEditorComponentsTest_AddedToEntity.py",
+            "hydra_AtomEditorComponents_AddedToEntity.py",
             timeout=EDITOR_TIMEOUT,
             expected_lines=expected_lines,
             unexpected_lines=unexpected_lines,