diff --git a/package-lock.json b/package-lock.json
index a2a00a89d..8f90898fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -56,7 +56,7 @@
         "@babel/core": "7.22.10",
         "@babel/polyfill": "7.12.1",
         "@babel/preset-env": "7.22.10",
-        "@govuk-pay/http-configurable-mock-server": "github:alphagov/http-configurable-mock-server#ac13d2d",
+        "@govuk-pay/run-amock": "github:alphagov/govuk-pay-run-amock#8632a53",
         "@pact-foundation/pact": "^12.1.1",
         "@pact-foundation/pact-core": "^14.0.5",
         "chai": "4.3.8",
@@ -1985,15 +1985,6 @@
         "kuler": "^2.0.0"
       }
     },
-    "node_modules/@govuk-pay/http-configurable-mock-server": {
-      "version": "0.0.1",
-      "resolved": "git+ssh://git@github.com/alphagov/http-configurable-mock-server.git#ac13d2da8a5f21f5ffa2a4d6a35af856dfd67911",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "http-configurable-mock-server": "bin/run"
-      }
-    },
     "node_modules/@govuk-pay/pay-js-commons": {
       "version": "6.0.6",
       "resolved": "https://registry.npmjs.org/@govuk-pay/pay-js-commons/-/pay-js-commons-6.0.6.tgz",
@@ -2053,6 +2044,15 @@
         "prom-client": "^14.2.0"
       }
     },
+    "node_modules/@govuk-pay/run-amock": {
+      "version": "0.0.1",
+      "resolved": "git+ssh://git@github.com/alphagov/govuk-pay-run-amock.git#8632a53c5f8c9cf006a70f12cf7c038e6d69205d",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "run-amock": "bin/run"
+      }
+    },
     "node_modules/@hapi/hoek": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
@@ -18143,11 +18143,6 @@
         "kuler": "^2.0.0"
       }
     },
-    "@govuk-pay/http-configurable-mock-server": {
-      "version": "git+ssh://git@github.com/alphagov/http-configurable-mock-server.git#ac13d2da8a5f21f5ffa2a4d6a35af856dfd67911",
-      "dev": true,
-      "from": "@govuk-pay/http-configurable-mock-server@github:alphagov/http-configurable-mock-server#ac13d2d"
-    },
     "@govuk-pay/pay-js-commons": {
       "version": "6.0.6",
       "resolved": "https://registry.npmjs.org/@govuk-pay/pay-js-commons/-/pay-js-commons-6.0.6.tgz",
@@ -18200,6 +18195,11 @@
         "prom-client": "^14.2.0"
       }
     },
+    "@govuk-pay/run-amock": {
+      "version": "git+ssh://git@github.com/alphagov/govuk-pay-run-amock.git#8632a53c5f8c9cf006a70f12cf7c038e6d69205d",
+      "dev": true,
+      "from": "@govuk-pay/run-amock@github:alphagov/govuk-pay-run-amock#8632a53"
+    },
     "@hapi/hoek": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
diff --git a/package.json b/package.json
index 9a675d963..4b1404a5c 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "test": "rm -rf ./pacts && NODE_ENV=test mocha '!(node_modules)/**/*.test'.js",
     "test:no-pact": "rm -rf ./pacts && NODE_ENV=test mocha --exclude **/*.pact.test.js '!(node_modules)/**/*.test'.js",
     "test:pact": "rm -rf ./pacts && NODE_ENV=test mocha **/*.pact.test.js",
-    "cypress:server": "http-configurable-mock-server --port=8000 | node --inspect -r dotenv/config start.js dotenv_config_path=test/cypress/test.env",
+    "cypress:server": "run-amock --port=8000 | node --inspect -r dotenv/config start.js dotenv_config_path=test/cypress/test.env",
     "cypress:test": "cypress run",
     "cypress:test-headed": "cypress open",
     "cypress:test-no-watch": "cypress open --config watchForFileChanges=false",
@@ -123,7 +123,7 @@
     "@babel/core": "7.22.10",
     "@babel/polyfill": "7.12.1",
     "@babel/preset-env": "7.22.10",
-    "@govuk-pay/http-configurable-mock-server": "github:alphagov/http-configurable-mock-server#ac13d2d",
+    "@govuk-pay/run-amock": "github:alphagov/govuk-pay-run-amock#8632a53",
     "@pact-foundation/pact": "^12.1.1",
     "@pact-foundation/pact-core": "^14.0.5",
     "chai": "4.3.8",
diff --git a/test/cypress/plugins/index.js b/test/cypress/plugins/index.js
index bf7ce20ee..bb890e41b 100644
--- a/test/cypress/plugins/index.js
+++ b/test/cypress/plugins/index.js
@@ -15,7 +15,7 @@ const cookieMonster = require('./cookie-monster')
 // the project's config changing)
 module.exports = (on, config) => {
   const stubSetupUrl = config.env.MOCK_HTTP_SERVER_URL + '/__add-mock-endpoints__'
-  const stubResetUrl = config.env.MOCK_HTTP_SERVER_URL + '/__clear-all-endpoints__'
+  const stubResetUrl = config.env.MOCK_HTTP_SERVER_URL + '/__clear-mock-endpoints__'
 
   on('task', {
     getCookies (opts) {