diff --git a/Makefile b/Makefile
index 55ae2b69..359a405e 100755
--- a/Makefile
+++ b/Makefile
@@ -47,16 +47,15 @@ $(eval TMP_DIR := $(shell mktemp -d))
 mkdir -p ${TMP_DIR}/ps_eventbus;
 cp -r $(shell cat .zip-contents) ${TMP_DIR}/ps_eventbus;
 cp $1 ${TMP_DIR}/ps_eventbus/config/parameters.yml;
+if [ $1 = ".config.e2e.yml" ]; then ./tests/Mocks/apply-ps-accounts-mock.sh ${TMP_DIR}/ps_eventbus; fi
 cd ${TMP_DIR} && zip -9 -r $2 ./ps_eventbus;
 mv ${TMP_DIR}/$2 ./dist;
 rm -rf ${TMP_DIR:-/dev/null};
 endef
 
-# target: zip-e2e                               - Bundle a local E2E integrable zip
+# target: zip-e2e                                - Bundle a local E2E integrable zip
 zip-e2e: vendor dist .config.e2e.yml
-	./tests/Mocks/apply-ps-accounts-mock.sh
 	@$(call zip_it,.config.e2e.yml,${PACKAGE}_e2e.zip)
-	./tests/Mocks/revert-ps-accounts-mock.sh
 
 # target: zip-inte                               - Bundle an integration zip
 zip-inte: vendor dist .config.inte.yml
diff --git a/tests/Mocks/PsAccounts.php b/tests/Mocks/PsAccounts.php
new file mode 100644
index 00000000..8b43bf05
--- /dev/null
+++ b/tests/Mocks/PsAccounts.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace PrestaShop\Module\PsEventBus\Mock;
+
+class PsAccountsServiceMock
+{
+    public function __construct()
+    {
+    }
+
+    public function getSuperAdminEmail()
+    {
+        return 'qa-autom@prestashop.com';
+    }
+
+    public function getShopUuid()
+    {
+        return 'f07181f7-2399-406d-9226-4b6c14cf6068';
+    }
+
+    public function getOrRefreshToken()
+    {
+        return 'eyJhbGciOiJSUzI1NiIsImtpZCI6IjFlOTczZWUwZTE2ZjdlZWY0ZjkyMWQ1MGRjNjFkNzBiMmVmZWZjMTkiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL3NlY3VyZXRva2VuLmdvb2dsZS5jb20vcHJlc3Rhc2hvcC1yZWFkeS1wcm9kIiwiYXVkIjoicHJlc3Rhc2hvcC1yZWFkeS1wcm9kIiwiYXV0aF90aW1lIjoxNjc5MDY1NzE0LCJ1c2VyX2lkIjoiZjA3MTgxZjctMjM5OS00MDZkLTkyMjYtNGI2YzE0Y2Y2MDY4Iiwic3ViIjoiZjA3MTgxZjctMjM5OS00MDZkLTkyMjYtNGI2YzE0Y2Y2MDY4IiwiaWF0IjoxNjc5MDY1NzE0LCJleHAiOjE2NzkwNjkzMTQsImVtYWlsIjoiaHR0cGM4MTg4ODE2Mjc1NjVldW5ncm9raW8xQHNob3AucHJlc3Rhc2hvcC5jb20iLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiZmlyZWJhc2UiOnsiaWRlbnRpdGllcyI6eyJlbWFpbCI6WyJodHRwYzgxODg4MTYyNzU2NWV1bmdyb2tpbzFAc2hvcC5wcmVzdGFzaG9wLmNvbSJdfSwic2lnbl9pbl9wcm92aWRlciI6ImN1c3RvbSJ9fQ.mbv_nY6rmz_OpfN32CyvsTa-ahlUO9FD1cok24HrZHNGkR-ZD6OzXvHedcFtU0RpafAdDdTYcU3GW_kiN_lqNwrbA2uO8LAS-JdQT1E1BFkhengrxFt8Gh_lBm_yE4B6DngvAs-6SGctmNxOc-wfWA3AC_CXKpJviu1P08tz7nYRwAQw_6EH1XaDVl9Cva51cCWUTFzWZ5VHgBUA-GdAyEbLkL9M9rRk0hy-KERwW-2plV_Mu5tpfnFUYZx2ZWwn-_ODEFyindyKiimuwZ6FF5p0pfZxfbMA_EXUdCsUlg1DMlv8zari-50PkhsnkD_DQ-dbmgpiKuM3ZFnL6vCSVw';
+    }
+
+    public function getRefreshToken()
+    {
+        return 'APJWN8eGz3m00UaeLKn80vFqoqzcQY5R39Uv78i8spcsKwg5j2SSzYKL5YyDk_bfTdJ8NLsn-L5YzmlpSasS3Ysj_kv2HJatbZg91v90tEHLXGh7lA_p_avWik8P5XTcXXn3bjGNh7VoDYS1nJhQPmYGyIrjNEv0yGewGkheWxrDstIKPuPuDQSmlJZtKdQVLYes1b27Ybi8NKvAtFKmmXvNCOlG_ZH3YQ';
+    }
+
+    public function getToken()
+    {
+        return 'eyJhbGciOiJSUzI1NiIsImtpZCI6IjFlOTczZWUwZTE2ZjdlZWY0ZjkyMWQ1MGRjNjFkNzBiMmVmZWZjMTkiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL3NlY3VyZXRva2VuLmdvb2dsZS5jb20vcHJlc3Rhc2hvcC1yZWFkeS1wcm9kIiwiYXVkIjoicHJlc3Rhc2hvcC1yZWFkeS1wcm9kIiwiYXV0aF90aW1lIjoxNjc5MDY1NzE0LCJ1c2VyX2lkIjoiZjA3MTgxZjctMjM5OS00MDZkLTkyMjYtNGI2YzE0Y2Y2MDY4Iiwic3ViIjoiZjA3MTgxZjctMjM5OS00MDZkLTkyMjYtNGI2YzE0Y2Y2MDY4IiwiaWF0IjoxNjc5MDY1NzE0LCJleHAiOjE2NzkwNjkzMTQsImVtYWlsIjoiaHR0cGM4MTg4ODE2Mjc1NjVldW5ncm9raW8xQHNob3AucHJlc3Rhc2hvcC5jb20iLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiZmlyZWJhc2UiOnsiaWRlbnRpdGllcyI6eyJlbWFpbCI6WyJodHRwYzgxODg4MTYyNzU2NWV1bmdyb2tpbzFAc2hvcC5wcmVzdGFzaG9wLmNvbSJdfSwic2lnbl9pbl9wcm92aWRlciI6ImN1c3RvbSJ9fQ.mbv_nY6rmz_OpfN32CyvsTa-ahlUO9FD1cok24HrZHNGkR-ZD6OzXvHedcFtU0RpafAdDdTYcU3GW_kiN_lqNwrbA2uO8LAS-JdQT1E1BFkhengrxFt8Gh_lBm_yE4B6DngvAs-6SGctmNxOc-wfWA3AC_CXKpJviu1P08tz7nYRwAQw_6EH1XaDVl9Cva51cCWUTFzWZ5VHgBUA-GdAyEbLkL9M9rRk0hy-KERwW-2plV_Mu5tpfnFUYZx2ZWwn-_ODEFyindyKiimuwZ6FF5p0pfZxfbMA_EXUdCsUlg1DMlv8zari-50PkhsnkD_DQ-dbmgpiKuM3ZFnL6vCSVw';
+    }
+
+    public function getUserUuid()
+    {
+        return 'f07181f7-2399-406d-9226-4b6c14cf6068';
+    }
+
+    public function isEmailValidated()
+    {
+        return true;
+    }
+
+    public function getEmail()
+    {
+        return 'qa-autom@prestashop.com';
+    }
+
+    public function isAccountLinked()
+    {
+        return true;
+    }
+
+    public function isAccountLinkedV4()
+    {
+        return true;
+    }
+}
+
+class PsAccounts
+{
+    private $psAccountsMock;
+
+    public function __construct()
+    {
+        $this->psAccountsMock = new PsAccountsServiceMock();
+    }
+
+    public function getService()
+    {
+        return $this->psAccountsMock;
+    }
+
+    public function getPsAccountsService()
+    {
+        return $this->getService();
+    }
+}
diff --git a/tests/Mocks/apply-ps-accounts-mock.sh b/tests/Mocks/apply-ps-accounts-mock.sh
index ce7aedbd..0c270ccf 100755
--- a/tests/Mocks/apply-ps-accounts-mock.sh
+++ b/tests/Mocks/apply-ps-accounts-mock.sh
@@ -1,8 +1,11 @@
 #!/bin/bash
-cd "$(dirname "$0")" || exit 1
+[ -z "$1" ] && {
+  echo "Error: Please provide a path to apply this script. Example if you are at the root of the git project: $0 ./" >&2;
+  exit 1;
+}
 
-SRC_DIR="../../src"
-CONFIG_DIR="../../config"
+SRC_DIR="$1/src"
+CONFIG_DIR="$1/config"
 
 SED_PARAMS=()
 if [[ "$OSTYPE" == "darwin"* ]]; then
@@ -12,7 +15,7 @@ else
 fi
 
 mkdir -p "$SRC_DIR/Mock"
-cp ./PSAccounts.php "$SRC_DIR/Mock/PsAccounts.php"
+cp "$(dirname "$0")/PsAccounts.php" "$SRC_DIR/Mock/PsAccounts.php"
 
 # I could not just inject my PsAccounts mock with the "class" attribute in Yaml
 # so dumb me thought: replace the naming everywhere it will work