diff --git a/assets/components/e2e-env/.travis.yml b/assets/components/e2e-env/.travis.yml
index 218496c8a410a..90bd67952b9e3 100644
--- a/assets/components/e2e-env/.travis.yml
+++ b/assets/components/e2e-env/.travis.yml
@@ -46,8 +46,10 @@ jobs:
     fast_finish: true
     include:
         - name: E2E Tests
-          script:
-            - npm explore @woocommerce/e2e-env -- npm run docker:up
-            - composer install
-            - npm run build
-            - npm explore @woocommerce/e2e-env -- npm run test:e2e
+    script:
+        - composer require wp-cli/i18n-command
+        - npm run build
+        - npm explore @woocommerce/e2e-env -- npm run docker:up
+        - npm explore @woocommerce/e2e-env -- npm run test:e2e
+    after_script:
+        - npm explore @woocommerce/e2e-env -- npm run docker:down
diff --git a/assets/components/e2e-env/docker-compose.yaml b/assets/components/e2e-env/docker-compose.yaml
index a6756c2823a52..1d4a7ce4d1ab7 100644
--- a/assets/components/e2e-env/docker-compose.yaml
+++ b/assets/components/e2e-env/docker-compose.yaml
@@ -41,6 +41,7 @@ services:
     build:
         context: ./docker/wp-cli
     restart: on-failure
+    user: xfs
     environment:
         WORDPRESS_PORT: ${WORDPRESS_PORT}
         WORDPRESS_HOST: wordpress-www:80
diff --git a/assets/components/e2e-env/docker/wordpress/Dockerfile b/assets/components/e2e-env/docker/wordpress/Dockerfile
index 199065d2013e8..4a132d9acbe4b 100644
--- a/assets/components/e2e-env/docker/wordpress/Dockerfile
+++ b/assets/components/e2e-env/docker/wordpress/Dockerfile
@@ -1 +1 @@
-FROM wordpress:5.3
+FROM wordpress:latest