diff --git a/docker-compose/setup-script/tests/configure/monitor.bats b/docker-compose/setup-script/tests/configure/monitor.bats
index 8a1c1df327..50efa5e45a 100755
--- a/docker-compose/setup-script/tests/configure/monitor.bats
+++ b/docker-compose/setup-script/tests/configure/monitor.bats
@@ -3,15 +3,15 @@
 NOCO_HOME="${HOME}/.nocodb"
 export NOCO_HOME
 
-WORKING_DIR="$(pwd)"
+
 
 setup() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/configure" || exit 1
   ./setup.sh "setup"
 }
 
 teardown() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/configure" || exit 1
   ./setup.sh
 }
 
diff --git a/docker-compose/setup-script/tests/configure/restart.bats b/docker-compose/setup-script/tests/configure/restart.bats
index b2c2d53777..eb388a0193 100755
--- a/docker-compose/setup-script/tests/configure/restart.bats
+++ b/docker-compose/setup-script/tests/configure/restart.bats
@@ -3,15 +3,15 @@
 NOCO_HOME="${HOME}/.nocodb"
 export NOCO_HOME
 
-WORKING_DIR="$(pwd)"
+
 
 setup() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/configure" || exit 1
   ./setup.sh "setup"
 }
 
 teardown() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/configure" || exit 1
   ./setup.sh
 }
 
diff --git a/docker-compose/setup-script/tests/configure/scale.bats b/docker-compose/setup-script/tests/configure/scale.bats
index d4b8c672cc..7b84d3c262 100755
--- a/docker-compose/setup-script/tests/configure/scale.bats
+++ b/docker-compose/setup-script/tests/configure/scale.bats
@@ -3,15 +3,15 @@
 NOCO_HOME="${HOME}/.nocodb"
 export NOCO_HOME
 
-WORKING_DIR="$(pwd)"
+
 
 setup() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/configure" || exit 1
   ./setup.sh "setup"
 }
 
 teardown() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/configure" || exit 1
   ./setup.sh
 }
 
diff --git a/docker-compose/setup-script/tests/configure/setup.sh b/docker-compose/setup-script/tests/configure/setup.sh
index ef17b873b7..57b782fbb8 100755
--- a/docker-compose/setup-script/tests/configure/setup.sh
+++ b/docker-compose/setup-script/tests/configure/setup.sh
@@ -19,4 +19,4 @@ if [ "$1" = "setup" ]; then
 
   cd "$NOCO_HOME" || exit
   docker compose down
-fi
\ No newline at end of file
+fi
diff --git a/docker-compose/setup-script/tests/configure/start.bats b/docker-compose/setup-script/tests/configure/start.bats
index 66d3736ea3..39595d1dc8 100755
--- a/docker-compose/setup-script/tests/configure/start.bats
+++ b/docker-compose/setup-script/tests/configure/start.bats
@@ -3,15 +3,15 @@
 NOCO_HOME="${HOME}/.nocodb"
 export NOCO_HOME
 
-WORKING_DIR="$(pwd)"
+
 
 setup() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/configure" || exit 1
   ./setup.sh "setup"
 }
 
 teardown() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/configure" || exit 1
   ./setup.sh
 }
 
diff --git a/docker-compose/setup-script/tests/configure/stop.bats b/docker-compose/setup-script/tests/configure/stop.bats
index 3b4f05959d..d28d15333f 100755
--- a/docker-compose/setup-script/tests/configure/stop.bats
+++ b/docker-compose/setup-script/tests/configure/stop.bats
@@ -3,15 +3,15 @@
 NOCO_HOME="${HOME}/.nocodb"
 export NOCO_HOME
 
-WORKING_DIR="$(pwd)"
+
 
 setup() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/configure" || exit 1
   ./setup.sh
 }
 
 teardown() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/configure" || exit 1
   ./setup.sh
 }
 
diff --git a/docker-compose/setup-script/tests/configure/upgrade.bats b/docker-compose/setup-script/tests/configure/upgrade.bats
index 10b04b3dfb..ad45726808 100755
--- a/docker-compose/setup-script/tests/configure/upgrade.bats
+++ b/docker-compose/setup-script/tests/configure/upgrade.bats
@@ -3,15 +3,15 @@
 NOCO_HOME="${HOME}/.nocodb"
 export NOCO_HOME
 
-WORKING_DIR="$(pwd)"
+
 
 setup() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/configure" || exit 1
   ./setup.sh "setup"
 }
 
 teardown() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/configure" || exit 1
   ./setup.sh
 }
 
diff --git a/docker-compose/setup-script/tests/install/default.bats b/docker-compose/setup-script/tests/install/default.bats
index 8edb902326..3417b71b3c 100755
--- a/docker-compose/setup-script/tests/install/default.bats
+++ b/docker-compose/setup-script/tests/install/default.bats
@@ -3,15 +3,15 @@
 NOCO_HOME="${HOME}/.nocodb"
 export NOCO_HOME
 
-WORKING_DIR="$(pwd)"
+
 
 setup() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/install" || exit 1
   ./setup.sh
 }
 
 teardown() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/install" || exit 1
   ./setup.sh
 }
 
diff --git a/docker-compose/setup-script/tests/install/ip.bats b/docker-compose/setup-script/tests/install/ip.bats
index 37be0cf4ec..95c5c5ab4f 100755
--- a/docker-compose/setup-script/tests/install/ip.bats
+++ b/docker-compose/setup-script/tests/install/ip.bats
@@ -3,15 +3,15 @@
 NOCO_HOME="${HOME}/.nocodb"
 export NOCO_HOME
 
-WORKING_DIR="$(pwd)"
+
 
 setup() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/install" || exit 1
   ./setup.sh
 }
 
 teardown() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/install" || exit 1
   ./setup.sh
 }
 
diff --git a/docker-compose/setup-script/tests/install/redis.bats b/docker-compose/setup-script/tests/install/redis.bats
index 4c1ed94030..4abc1d01c5 100755
--- a/docker-compose/setup-script/tests/install/redis.bats
+++ b/docker-compose/setup-script/tests/install/redis.bats
@@ -3,15 +3,15 @@
 NOCO_HOME="${HOME}/.nocodb"
 export NOCO_HOME
 
-WORKING_DIR="$(pwd)"
+
 
 setup() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/install" || exit 1
   ./setup.sh
 }
 
 teardown() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/install" || exit 1
   ./setup.sh
 }
 
diff --git a/docker-compose/setup-script/tests/install/scale.bats b/docker-compose/setup-script/tests/install/scale.bats
index e64a7bf16f..7076e8176c 100755
--- a/docker-compose/setup-script/tests/install/scale.bats
+++ b/docker-compose/setup-script/tests/install/scale.bats
@@ -3,15 +3,15 @@
 NOCO_HOME="${HOME}/.nocodb"
 export NOCO_HOME
 
-WORKING_DIR="$(pwd)"
+
 
 setup() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/install" || exit 1
   ./setup.sh
 }
 
 teardown() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/install" || exit 1
   ./setup.sh
 }
 
diff --git a/docker-compose/setup-script/tests/install/setup.sh b/docker-compose/setup-script/tests/install/setup.sh
index 2397e20809..8cedb9e1d9 100755
--- a/docker-compose/setup-script/tests/install/setup.sh
+++ b/docker-compose/setup-script/tests/install/setup.sh
@@ -10,3 +10,8 @@ if [ -d "$NOCO_HOME" ]; then
 fi
 
 rm -rf "$NOCO_HOME"
+
+clear()
+{
+  echo "clear mocked"
+}
diff --git a/docker-compose/setup-script/tests/install/ssl.bats b/docker-compose/setup-script/tests/install/ssl.bats
index d82f222d71..62d57be1af 100644
--- a/docker-compose/setup-script/tests/install/ssl.bats
+++ b/docker-compose/setup-script/tests/install/ssl.bats
@@ -1,16 +1,16 @@
 #!/usr/bin/env bats
 
-WORKING_DIR="$(pwd)"
+
 
 RANDOM_NUMBER=$RANDOM
 
 setup() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/install" || exit 1
   ./setup.sh
 }
 
 teardown() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/install" || exit 1
   ./setup.sh
 }
 
diff --git a/docker-compose/setup-script/tests/install/watchtower.bats b/docker-compose/setup-script/tests/install/watchtower.bats
index b66a1936eb..68f9cd651c 100755
--- a/docker-compose/setup-script/tests/install/watchtower.bats
+++ b/docker-compose/setup-script/tests/install/watchtower.bats
@@ -3,15 +3,13 @@
 NOCO_HOME="${HOME}/.nocodb"
 export NOCO_HOME
 
-WORKING_DIR="$(pwd)"
-
 setup() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/install" || exit 1
   ./setup.sh
 }
 
 teardown() {
-  cd "${WORKING_DIR}" || exit 1
+  cd "${WORKING_DIR}/install" || exit 1
   ./setup.sh
 }