diff --git a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
index 8e5e5e8c32..736aa8d8ab 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
@@ -44,38 +44,28 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
     )
 
     ly_add_pytest(
-        NAME AutomatedTesting::SmokeTest
-        TEST_SUITE smoke
-        TEST_SERIAL
+        NAME AutomatedTesting::EditorTestWithGPU
         TEST_REQUIRES gpu
         PATH ${CMAKE_CURRENT_LIST_DIR}/test_Editor_NewExistingLevels_Works.py
-        PYTEST_MARKS "SUITE_smoke"
-        TIMEOUT 500
+        TIMEOUT 100
         RUNTIME_DEPENDENCIES
             AZ::AssetProcessor
             AZ::PythonBindingsExample
             Legacy::Editor
             AutomatedTesting.GameLauncher
             AutomatedTesting.Assets
-        COMPONENT
-            Smoke
     )
 
     ly_add_pytest(
-        NAME AutomatedTesting::SmokeTest
-        TEST_SUITE smoke
-        TEST_SERIAL
+        NAME AutomatedTesting::GameLauncherWithGPU
         TEST_REQUIRES gpu
         PATH ${CMAKE_CURRENT_LIST_DIR}/test_GameLauncher_EnterExitGameMode_Works.py
-        PYTEST_MARKS "SUITE_smoke"
-        TIMEOUT 500
+        TIMEOUT 100
         RUNTIME_DEPENDENCIES
             AZ::AssetProcessor
             AZ::PythonBindingsExample
             Legacy::Editor
             AutomatedTesting.GameLauncher
             AutomatedTesting.Assets
-        COMPONENT
-            Smoke
     )
 endif()