diff --git a/package.json b/package.json
index 1ce4ab71e64..e8dc78d714e 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "sideEffects": false,
   "scripts": {
     "start": "BABEL_MODULES=false webpack-dev-server --port 8030 --inline --hot --config=src-docs/webpack.config.js",
-    "test-docker": "docker pull zenato/puppeteer && docker run -i --rm --cap-add=SYS_ADMIN --volume $PWD:/app --workdir /app -e GIT_COMMITTER_NAME=test -e GIT_COMMITTER_EMAIL=test -e HOME=/tmp --name puppeteer-chrome zenato/puppeteer bash -c 'npm config set spin false && /opt/yarn*/bin/yarn && npm run test && npm run start-test-server-and-a11y-test && npm run build'",
+    "test-docker": "sh ./scripts/test_docker.sh",
     "sync-docs": "node ./scripts/docs-sync.js",
     "build-docs": "BABEL_MODULES=false cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=4096 webpack --config=src-docs/webpack.config.js",
     "build": "yarn extract-i18n-strings && node ./scripts/compile-clean.js && node ./scripts/compile-eui.js && node ./scripts/compile-scss.js $npm_package_name",
diff --git a/scripts/test_docker.sh b/scripts/test_docker.sh
new file mode 100644
index 00000000000..6e6ae0603f3
--- /dev/null
+++ b/scripts/test_docker.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+docker pull zenato/puppeteer
+docker run -i --rm --cap-add=SYS_ADMIN --volume $PWD:/app --workdir /app \
+    -e GIT_COMMITTER_NAME=test -e GIT_COMMITTER_EMAIL=test -e HOME=/tmp \
+    zenato/puppeteer \
+    bash -c 'npm config set spin false && /opt/yarn*/bin/yarn && npm run test && npm run start-test-server-and-a11y-test && npm run build'