diff --git a/robot/actor_context_management.robot b/robot/actor_context_management.robot
index e6e7ffc04..59975810c 100644
--- a/robot/actor_context_management.robot
+++ b/robot/actor_context_management.robot
@@ -15,13 +15,12 @@ ${UNIQUE_ID}            ${EMPTY}
 *** Test Cases ***
 Test Context Commands With Actor
     [Documentation]    Verify context commands work with actor-first approach
+    [Tags]    smoke    actor    context
 
     # Initialize project first
     Create Directory    ${TEST_PROJECT_DIR}
     ${result} =    Run Process    ${PYTHON}    -m    cleveragents    init    test-project
-    ...    cwd=${TEST_PROJECT_DIR}
-    Log    Init stdout: ${result.stdout}
-    Log    Init stderr: ${result.stderr}
+    ...    cwd=${TEST_PROJECT_DIR}    timeout=120s
     Should Be Equal As Integers    ${result.rc}    0
 
     # Create test files
@@ -29,27 +28,16 @@ Test Context Commands With Actor
     Create File    ${TEST_PROJECT_DIR}/src/main.py    print("Hello World")
 
     # Load context with actor (simulating with environment variable)
-    Set Environment Variable    CLEVERAGENTS_TESTING_USE_MOCK_AI    true
-    Set Environment Variable    CLEVERAGENTS_DEFAULT_ACTOR    openai/gpt-4
-
     ${result} =    Run Process    ${PYTHON}    -m    cleveragents    context-load    src/
-    ...    cwd=${TEST_PROJECT_DIR}
+    ...    cwd=${TEST_PROJECT_DIR}    env:CLEVERAGENTS_TESTING_USE_MOCK_AI=true    env:CLEVERAGENTS_DEFAULT_ACTOR=openai/gpt-4    timeout=120s
     Should Be Equal As Integers    ${result.rc}    0
 
     # List contexts
     ${result} =    Run Process    ${PYTHON}    -m    cleveragents    context    list
-    ...    cwd=${TEST_PROJECT_DIR}
+    ...    cwd=${TEST_PROJECT_DIR}    timeout=30s
     Should Be Equal As Integers    ${result.rc}    0
     Should Contain    ${result.stdout}    main.py
 
-
-
-
-
-
-
-
-
 *** Keywords ***
 Setup Test Environment
     [Documentation]    Create test environment