diff --git a/.travis.yml b/.travis.yml
index 14d56ff1..9fac3468 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,4 +9,4 @@ env:
 services:
   - docker
 before_install: docker pull ${DOCKER_IMAGE}
-script: npm run docker-test -- ${DOCKER_IMAGE} ${NODE_VERSION}
+script: npm run ci:test
diff --git a/package.json b/package.json
index 2e90e5f0..d0e808de 100644
--- a/package.json
+++ b/package.json
@@ -78,8 +78,8 @@
     "posttest": "npm run test:teardown",
     "test:teardown": "NODE_ENV=test node test teardown",
     "update-internal-deps": "rm -rf node_modules && npm install",
-    "docker-test": "./docker-test.sh",
-    "docker-bash": "./docker-bash.sh"
+    "ci:test": "docker run -e \"NODEJS_VERSION=$NODE_VERSION\" -v `pwd`:/srv $DOCKER_IMAGE bash run_tests_docker.sh && docker ps --filter status=dead --filter status=exited -aq | xargs docker rm -v",
+    "docker:bash": "docker run -it -v `pwd`:/srv $DOCKER_IMAGE bash"
   },
   "engines": {
     "node": "^10.15.1",