diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py
index 74f34659c0..d375e69ac2 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py
@@ -98,11 +98,6 @@ class EditorTestHelper:
                 self.test_success = False
                 success = False
 
-        # Turn off any display info like FPS, as that will mess up our image comparisons
-        # Turn off antialiasing as well
-        general.run_console("r_displayInfo=0")
-        general.run_console("r_antialiasingmode=0")
-        general.idle_wait(1.0)
         return success
 
     # Test Teardown
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py
index 208ef40d41..3eeb3ddf84 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py
@@ -64,8 +64,6 @@ class TestEditMenuOptions(EditorTestHelper):
             ("Modify", "Transform Mode", "Move"),
             ("Modify", "Transform Mode", "Rotate"),
             ("Modify", "Transform Mode", "Scale"),
-            ("Lock Selection",),
-            ("Unlock All Entities",),
             ("Editor Settings", "Global Preferences"),
             ("Editor Settings", "Graphics Settings"),
             ("Editor Settings", "Editor Settings Manager"),
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py
index 05ee802d19..173d658b3c 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py
@@ -50,7 +50,6 @@ class TestViewMenuOptions(EditorTestHelper):
             ("Center on Selection",),
             ("Show Quick Access Bar",),
             ("Viewport", "Wireframe"),
-            ("Viewport", "Grid Settings"),
             ("Viewport", "Go to Position"),
             ("Viewport", "Center on Selection"),
             ("Viewport", "Go to Location"),
diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py b/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py
index a75b3b36cd..c2d515e250 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py
@@ -40,7 +40,7 @@ class TestDocking(object):
 
     @pytest.mark.test_case_id("C6376081")
     @pytest.mark.SUITE_periodic
-    def test_basic_docked_tools(self, request, editor, level, launcher_platform):
+    def test_Docking_BasicDockedTools(self, request, editor, level, launcher_platform):
         expected_lines = [
             "The tools are all docked together in a tabbed widget",
             "Entity Outliner works when docked, can select an Entity",
diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py b/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py
index 251bd7cfed..70a22f9e2a 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py
@@ -59,8 +59,6 @@ class TestMenus(object):
             "Move Action triggered",
             "Rotate Action triggered",
             "Scale Action triggered",
-            "Lock Selection Action triggered",
-            "Unlock All Entities Action triggered",
             "Global Preferences Action triggered",
             "Graphics Settings Action triggered",
             "Editor Settings Manager Action triggered",
@@ -93,7 +91,6 @@ class TestMenus(object):
             "Center on Selection Action triggered",
             "Show Quick Access Bar Action triggered",
             "Wireframe Action triggered",
-            "Grid Settings Action triggered",
             "Go to Position Action triggered",
             "Center on Selection Action triggered",
             "Go to Location Action triggered",