diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0e103d79..4edbf7cc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -230,7 +230,7 @@ jobs:
   # Execute integration tests based on the build results coming from the "build/centos7" job
   "tests/integration":
     docker:
-      - image: falcosecurity/falco-tester:latest
+      - image: falcosecurity/falco-tester:feat-minimal-build # todo(fntlnz): change this to latest before merge, but first, update the image on docker hub
         environment:
           SOURCE_DIR: "/source"
           BUILD_DIR: "/build"
@@ -244,7 +244,7 @@ jobs:
           command: /usr/bin/entrypoint test
   "tests/integration-static":
     docker:
-      - image: falcosecurity/falco-tester:latest
+      - image: falcosecurity/falco-tester:feat-minimal-build # todo(fntlnz): change this to latest before merge, but first, update the image on docker hub
         environment:
           SOURCE_DIR: "/source-static"
           BUILD_DIR: "/build-static"
diff --git a/docker/tester/root/usr/bin/entrypoint b/docker/tester/root/usr/bin/entrypoint
index 73547d02..fb145a80 100755
--- a/docker/tester/root/usr/bin/entrypoint
+++ b/docker/tester/root/usr/bin/entrypoint
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-set -eu -o pipefail
+set -u -o pipefail
+
+BUILD_DIR=${BUILD_DIR:-/build}
+SOURCE_DIR=${SOURCE_DIR:-/source}
 
-SOURCE_DIR=/source
-BUILD_DIR=/build
 CMD=${1:-test}
 shift