diff --git a/package-lock.json b/package-lock.json
index 7902e4ee2..9da36811a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,7 +39,7 @@
       "devDependencies": {
         "@babel/core": "^7.23.2",
         "@babel/preset-env": "^7.23.2",
-        "@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",
         "@snyk/protect": "^1.1235.x",
@@ -2035,15 +2035,6 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.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.12",
       "resolved": "https://registry.npmjs.org/@govuk-pay/pay-js-commons/-/pay-js-commons-6.0.12.tgz",
@@ -2103,6 +2094,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/@humanwhocodes/config-array": {
       "version": "0.11.14",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
diff --git a/package.json b/package.json
index b921d46a5..dc00bdb95 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "snyk-protect": "snyk-protect",
     "prepublish": "npm run snyk-protect",
     "publish-pacts": "./bin/publish-pacts.js",
-    "cypress:server": "http-configurable-mock-server --port=8000 --debug | node --inspect -r dotenv/config config/start.js dotenv_config_path=test/cypress/test.env",
+    "cypress:server": "run-amock --port=8000 --debug | node --inspect -r dotenv/config 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"
@@ -91,7 +91,7 @@
   "devDependencies": {
     "@babel/core": "^7.23.2",
     "@babel/preset-env": "^7.23.2",
-    "@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",
     "@snyk/protect": "^1.1235.x",
diff --git a/test/cypress/plugins/index.js b/test/cypress/plugins/index.js
index dcb414f5a..86c11a63f 100644
--- a/test/cypress/plugins/index.js
+++ b/test/cypress/plugins/index.js
@@ -13,7 +13,7 @@ const axios = require('axios')
 // 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', {
     /**