diff --git a/e2e-tests/data/autoscaler.yaml b/e2e-tests/data/autoscaler.yaml
index ce41f32..e94227c 100644
--- a/e2e-tests/data/autoscaler.yaml
+++ b/e2e-tests/data/autoscaler.yaml
@@ -71,7 +71,7 @@
   job:
     jarURI: local:///opt/flink/examples/streaming/StateMachineExample.jar
     parallelism: 2
-    upgradeMode: last-state
+    upgradeMode: savepoint
   mode: native
 
 ---
diff --git a/e2e-tests/test_autoscaler.sh b/e2e-tests/test_autoscaler.sh
index 49767d6..100f948 100644
--- a/e2e-tests/test_autoscaler.sh
+++ b/e2e-tests/test_autoscaler.sh
@@ -46,6 +46,7 @@
   echo "Verifying inplace scaling triggered"
   wait_for_event FlinkDeployment $CLUSTER_ID .reason==\"Scaling\" ${TIMEOUT} || exit 1
 fi
+wait_for_status $APPLICATION_IDENTIFIER '.status.jobStatus.state' RUNNING ${TIMEOUT} || exit 1
 wait_for_status $APPLICATION_IDENTIFIER '.status.lifecycleState' STABLE ${TIMEOUT} || exit 1
 
 check_operator_log_for_errors || exit 1