diff --git a/e2e/start.sh b/e2e/start.sh
index caadb57..334a9a5 100755
--- a/e2e/start.sh
+++ b/e2e/start.sh
@@ -7,27 +7,5 @@ then
 fi
 
 docker-compose version
-docker-compose -f "$file" up --build -d --pull=never
-
-while true
-do
-    docker-compose -f "$file" ps | grep testing
-    if [ $? -eq 1 ]
-    then
-        code=-1
-        docker-compose -f "$file" logs | grep server
-        docker-compose -f "$file" logs | grep testing
-        docker-compose ps -a | grep testing | grep "Exited (0)"
-        if [ $? -eq 0 ]
-        then
-            code=0
-            echo "successed"
-        fi
-        docker-compose ps -a
-
-        docker-compose -f "$file" down
-        set -e
-        exit $code
-    fi
-    sleep 1
-done
+docker-compose -f "$file" down
+docker-compose -f "$file" up --build testing --exit-code-from testing --remove-orphans
diff --git a/e2e/test-suite.yaml b/e2e/test-suite.yaml
index 30c9ce5..d630674 100644
--- a/e2e/test-suite.yaml
+++ b/e2e/test-suite.yaml
@@ -92,7 +92,7 @@ items:
       Authorization: "{{ .param.auth }}"
   expect:
     bodyFieldsExpect:
-      message: cookies are empty
+      message: not found
 - name: have-cookie
   request:
     api: /cookies/echo