diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 695f59ddb..f41a7cafd 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -19,9 +19,10 @@ jobs:
           context: containers/php
           file: containers/php/Dockerfile-PHP-5.6
           push: false
-          tags: lucatume/wp-browser-v3-build:php5.6-apache
+          tags: lucatume/wp-browser-v3-wordpress:php5.6-apache
           cache-from: type=gha,scope=5.6
           cache-to: type=gha,mode=max,scope=5.6
+          load: true
           build-args: |
             PHP_VERSION=5.6
             WP_IMAGE_VERSION=5
@@ -35,9 +36,10 @@ jobs:
           context: containers/php
           file: containers/php/Dockerfile-PHP-5.6
           push: false
-          tags: lucatume/wp-browser-v3-build:php5.6-codeception
+          tags: lucatume/wp-browser-v3-codecept:php5.6
           cache-from: type=gha,scope=5.6
           cache-to: type=gha,mode=max,scope=5.6
+          load: true
           build-args: |
             PHP_VERSION=5.6
             WP_IMAGE_VERSION=5
@@ -70,14 +72,15 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: containers/php
-          file: containers/php/Dockerfile
+          file: containers/php/Dockerfile-PHP-5.6
           push: false
-          tags: lucatume/wp-browser-v3-build:php${{ matrix.php_version }}-apache
-          cache-from: type=gha,scope=${{ matrix.php_version }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.php_version }}
+          tags: lucatume/wp-browser-v3-wordpress:php5.6-apache
+          cache-from: type=gha,scope=5.6
+          cache-to: type=gha,mode=max,scope=5.6
+          load: true
           build-args: |
-            PHP_VERSION=${{ matrix.php_version }}
-            WP_IMAGE_VERSION=6
+            PHP_VERSION=5.6
+            WP_IMAGE_VERSION=5
             TARGET=wordpress
             USER_UID=33
             USER_GID=33
@@ -88,9 +91,10 @@ jobs:
           context: containers/php
           file: containers/php/Dockerfile
           push: false
-          tags: lucatume/wp-browser-v3-build:php${{ matrix.php_version }}-codeception
+          tags: lucatume/wp-browser-v3-codecept:php${{ matrix.php_version }}
           cache-from: type=gha,scope=${{ matrix.php_version }}
           cache-to: type=gha,mode=max,scope=${{ matrix.php_version }}
+          load: true
           build-args: |
             PHP_VERSION=${{ matrix.php_version }}
             WP_IMAGE_VERSION=6
@@ -99,7 +103,7 @@ jobs:
             USER_GID=33
             USER_NAME=www-data
       - name: Build
-        run: bin/stack -p${{ matrix.php_version }} build
+        run: bin/stack -p5.6 build
       - name: Cache Composer dependencies
         uses: actions/cache@v3
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74a5f52c7..8fd527e22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased] Unreleased
 
+### Fixed
+
+- Ensure `_before` and `_after` methods are called correctly by `WPTestCase`.
+
 ## [3.2.0] 2023-09-15;
 
 ### Breaking change
diff --git a/Makefile b/Makefile
index 4b8994106..d6191f9bd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,8 @@
 build:
+	bin/stack build_images
 	bin/stack -p5.6 build
-	bin/stack -p7.0 build
-	bin/stack -p7.1 build
-	bin/stack -p7.2 build
-	bin/stack -p7.3 build
-	bin/stack -p7.4 build
-	bin/stack -p8.0 build
-	bin/stack -p8.1 build
 .PHONY: build
 
-build_images:
-	bin/stack -p5.6 build_images
-	bin/stack -p7.0 build_images
-	bin/stack -p7.1 build_images
-	bin/stack -p7.2 build_images
-	bin/stack -p7.3 build_images
-	bin/stack -p7.4 build_images
-	bin/stack -p8.0 build_images
-	bin/stack -p8.1 build_images
-
 build_56_lock_files:
 	[ -d config/composer ] || mkdir config/composer
 	rm -f config/composer/*5.6*
@@ -40,46 +24,6 @@ build_56_lock_files:
 
 	mv config/composer/composer.json.bak composer.json
 
-build_74_lock_files:
-	[ -d config/composer ] || mkdir config/composer
-	cp composer.json config/composer/composer.json.bak
-
-	bin/stack -p7.4 -d -c2 composer_update
-	mv composer.json config/composer/composer-7.4-codeception-2.json
-	mv composer.lock config/composer/composer-7.4-codeception-2.lock
-	cp config/composer/composer.json.bak composer.json
-
-	bin/stack -p7.4 -d -c3 composer_update
-	mv composer.json config/composer/composer-7.4-codeception-3.json
-	mv composer.lock config/composer/composer-7.4-codeception-3.lock
-	cp config/composer/composer.json.bak composer.json
-
-	bin/stack -p7.4 -d -c4 composer_update
-	mv composer.json config/composer/composer-7.4-codeception-4.json
-	mv composer.lock config/composer/composer-7.4-codeception-4.lock
-
-	mv config/composer/composer.json.bak composer.json
-
-build_80_lock_files:
-	[ -d config/composer ] || mkdir config/composer
-	cp composer.json config/composer/composer.json.bak
-
-	bin/stack -p8.0 -d -c4 composer_update
-	mv composer.json config/composer/composer-8.0-codeception-4.json
-	mv composer.lock config/composer/composer-8.0-codeception-4.lock
-
-	mv config/composer/composer.json.bak composer.json
-
-build_81_lock_files:
-	[ -d config/composer ] || mkdir config/composer
-	cp composer.json config/composer/composer.json.bak
-
-	bin/stack -p8.1 -d -c4 composer_update
-	mv composer.json config/composer/composer-8.1-codeception-4.json
-	mv composer.lock config/composer/composer-8.1-codeception-4.lock
-
-	mv config/composer/composer.json.bak composer.json
-
 lint:
 	docker run --rm \
 		--volume "$(PWD):$(PWD):ro" \
@@ -140,14 +84,11 @@ static_analysis: lint phpcs phpstan
 .PHONE: static_analysis
 
 test: static_analysis
-	bin/stack -p5.6 xdebug-off && bin/stack -c2 composer_update && bin/stack -p5.6 test
-	bin/stack -p5.6 xdebug-off && bin/stack -c3 composer_update && bin/stack -p5.6 test
-	bin/stack -p5.6 xdebug-off && bin/stack -c4 composer_update && bin/stack -p5.6 test
-	bin/stack -p7.4 xdebug-off && bin/stack -c2 composer_update && bin/stack -p7.4 test
-	bin/stack -p7.4 xdebug-off && bin/stack -c3 composer_update && bin/stack -p7.4 test
-	bin/stack -p7.4 xdebug-off && bin/stack -c4 composer_update && bin/stack -p7.4 test
-	bin/stack -p8.0 xdebug-off && bin/stack -c4 composer_update && bin/stack -p8.0 test
-	bin/stack -p8.1 xdebug-off && bin/stack -c4 composer_update && bin/stack -p8.1 test
+	bin/stack -p5.6 xdebug-off && bin/stack composer_update && bin/stack -p5.6 test
+	bin/stack -p7.4 xdebug-off && bin/stack composer_update && bin/stack -p7.4 test
+	bin/stack -p8.0 xdebug-off && bin/stack composer_update && bin/stack -p8.0 test
+	bin/stack -p8.1 xdebug-off && bin/stack composer_update && bin/stack -p8.1 test
+	bin/stack -p8.2 xdebug-off && bin/stack composer_update && bin/stack -p8.2 test
 .PHONY: test
 
 clean:
diff --git a/bin/stack b/bin/stack
index a26f03bb3..a8d4d4f76 100755
--- a/bin/stack
+++ b/bin/stack
@@ -87,6 +87,12 @@ export USER_GID=$(id -g)
 export USER_NAME=$(id -un)
 export PWD="$(pwd)"
 
+if [[ "${PHP_VERSION}" =~ ^(5.6|7.0|7.1|7.2|7.3)$ ]]; then
+  export WORDPRESS_VERSION=5
+else
+  export WORDPRESS_VERSION=6
+fi
+
 # If the current architecture is arm64, use the arm64v8 images.
 if [ "$(arch)" = "arm64" ]; then
   export DOCKER_CHROME_IMAGE="seleniarm/standalone-chromium:116.0-20230828"
@@ -154,10 +160,10 @@ function ensure_wordpress_scaffolded() {
 
 function run_wp_cli_command() {
   docker run --rm -v "${PWD}/var/wordpress:/var/www/html" \
-    --network "wpbrowser_php_${PHP_VERSION}" \
+    --network "wpbrowser_v3" \
     -w /var/www/html \
     -u "${USER_UID}:${USER_GID}" \
-    "lucatume/wp-browser-v3-build:php${PHP_VERSION}-apache" \
+    "lucatume/wp-browser-v3-wordpress:php5.6-apache" \
     wp --allow-root --url=http://wordpress.test --path=/var/www/html "$@"
 }
 
@@ -175,10 +181,10 @@ function ensure_wordpress_configured() {
   # If the var/wordpress/wp-config.php file is not found, configure WordPress using wp-cli.
   # Configure WordPress using wp-cli.
   if ! docker run --rm -v "${PWD}/var/wordpress:/var/www/html" \
-    --network "wpbrowser_php_${PHP_VERSION}" \
+    --network "wpbrowser_v3" \
     -w /var/www/html \
     -u "${USER_UID}:${USER_GID}" \
-    "lucatume/wp-browser-v3-build:php${PHP_VERSION}-apache" \
+    "lucatume/wp-browser-v3-wordpress:php5.6-apache" \
     bash -c "wp --allow-root core config --dbname=wordpress --dbuser=root --dbpass=password --dbhost=database --dbprefix=wp_ --extra-php <<PHP
 define( 'WP_DEBUG', true );
 define( 'WP_DEBUG_LOG', true );
@@ -233,27 +239,12 @@ function ensure_externals_unblocked() {
 }
 
 function build_images() {
-  if [ "${PHP_VERSION}" = "5.6" ]; then
-    export DOCKERFILE_SUFFIX="-PHP-5.6"
-  fi
-
-if [ "${PHP_VERSION}" = "5.6" ]; then
-    export WP_IMAGE_VERSION="5"
-  else
-    export WP_IMAGE_VERSION="6"
-  fi
-
-  docker compose build --build-arg "WP_IMAGE_VERSION=${WP_IMAGE_VERSION}" --progress plain wordpress || exit 1
-  docker compose build --build-arg "WP_IMAGE_VERSION=${WP_IMAGE_VERSION}" --progress plain codecept || exit 1
+  docker compose build || exit 1
 }
 
 function build() {
   [ ! -d "${PWD}/var/cache/composer" ] && mkdir -p "${PWD}/var/cache/composer"
   docker compose pull --ignore-buildable || exit 1
-  # Skip building the images if SKIP_BUILD is 1.
-  if [ "${SKIP_BUILD}" = "0" ]; then
-    build_images
-  fi
   docker compose up -d --force-recreate --wait database || exit 1
   ensure_wordpress_scaffolded
   ensure_wordpress_configured
@@ -262,7 +253,12 @@ function build() {
   ensure_wordpress_updated
   docker compose up -d --wait wordpress
   docker compose up -d --wait chrome
-  docker compose up -d --wait codecept
+
+  # Up all the Codecept versions.
+  for version in "${SUPPORTED_PHP_VERSIONS[@]}"; do
+    docker compose up -d --wait codecept_${version}
+  done
+
   ensure_test_databases
   ensure_twentytwenty_theme
   ensure_twentytwentyone_theme
@@ -271,22 +267,16 @@ function build() {
 }
 
 function clean() {
-  for version in "${SUPPORTED_PHP_VERSIONS[@]}"; do
-    PHP_VERSION=$version docker compose down -v
-    PHP_VERSION=$version docker compose rm -f
-    docker rmi "lucatume/wp-browser-v3-build:php${version}-apache"
-    docker rmi "lucatume/wp-browser-v3-build:php${version}-codeception"
-  done
+  docker compose down -v || true
+  docker compose rm -f || true
+  docker rmi $(docker image ls -q lucatume/wp-browser-v3-wordpress) || true
+  docker rmi $(docker image ls -q lucatume/wp-browser-v3-codecept) || true
 
-  rm -rf var/wordpress
+  rm -rf var && mkdir -p var
 }
 
 function clean_tmp() {
-  if [[ "$OSTYPE" == "darwin"* ]] && [ -f docker-compose.override.yml ] && [ -d /Volumes/WP-Browser-Ram-Disk/ ]; then
-    rm -rf /Volumes/WP-Browser-Ram-Disk/*
-  else
-    rm -rf "$(pwd)/var/tmp"
-  fi
+  rm -rf "$(pwd)/var/tmp"
 }
 
 function config() {
@@ -299,7 +289,7 @@ function composer_run() {
     -w "$(pwd)" \
     --no-deps \
     --entrypoint=bash \
-    codecept -c "composer $*" || exit 1
+    codecept_${PHP_VERSION} -c "composer $*" || exit 1
 }
 
 function composer_update() {
@@ -320,18 +310,18 @@ function run_tests() {
     echo "Running tests for suite $suite ... "
     echo "=============================================================================="
     docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)" \
-      codecept bash -c "php vendor/bin/codecept run $suite --ext DotReporter" || exit 1
+      codecept_${PHP_VERSION} bash -c "php vendor/bin/codecept run $suite --ext DotReporter" || exit 1
   done
 }
 
 function xdebug_off() {
   docker compose exec -u "$(id -u):$(id -g)" -w "/var/www/html" wordpress bash xdebug-off || exit 1
-  docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)" codecept bash xdebug-off || exit 1
+  docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)" codecept_${PHP_VERSION} bash xdebug-off || exit 1
 }
 
 function xdebug_on() {
   docker compose exec -u "$(id -u):$(id -g)" -w "/var/www/html" wordpress bash xdebug-on || exit 1
-  docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)}" codecept bash xdebug-on || exit 1
+  docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)}" codecept_${PHP_VERSION} bash xdebug-on || exit 1
 }
 
 COMMAND=${1:-help}
@@ -376,6 +366,9 @@ down)
   ;;
 exec)
   service=${2:-codecept}
+  if [ $service = 'codecept' ]; then
+    service="codecept_${PHP_VERSION}"
+  fi
   docker compose exec -u "$(id -u):$(id -g)" -it -w "$(pwd)" "$service" "${@:2}"
   ;;
 help)
@@ -388,19 +381,22 @@ mysql)
   docker compose exec database mysql -u root -ppassword
   ;;
 phpcs)
-  docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)" codecept bash -c "composer run cs"
+  docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)" codecept_${PHP_VERSION} bash -c "composer run cs"
   ;;
 phpcbf)
-  docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)" codecept bash -c "composer run cs-fix"
+  docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)" codecept_${PHP_VERSION} bash -c "composer run cs-fix"
   ;;
 phpstan)
-  docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)" codecept bash -c "composer run stan"
+  docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)" codecept_${PHP_VERSION} bash -c "composer run stan"
   ;;
 ps)
   docker compose ps
   ;;
 ssh)
   service=${2:-codecept}
+  if [ $service = "codecept" ]; then
+    service="codecept_${PHP_VERSION}"
+  fi
   # If ROOT is set, set the user to "0:0", else set the user to the current user.
   if [ "${ROOT}" ]; then
     docker_user="0:0"
@@ -411,7 +407,7 @@ ssh)
   ;;
 run)
   shift
-  docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)" codecept php vendor/bin/codecept run $@
+  docker compose exec -u "$(id -u):$(id -g)" -w "$(pwd)" codecept_${PHP_VERSION} php vendor/bin/codecept run $@
   ;;
 test)
   run_tests
diff --git a/containers/php/Dockerfile-PHP-5.6 b/containers/php/Dockerfile-PHP-5.6
index d5df2223a..33e460d13 100644
--- a/containers/php/Dockerfile-PHP-5.6
+++ b/containers/php/Dockerfile-PHP-5.6
@@ -2,13 +2,13 @@ ARG PHP_VERSION=5.6
 ARG COMPOSER_VERSION=2.2
 
 FROM composer:${COMPOSER_VERSION} AS composer
-FROM lucatume/codeception-php-5.6:cc3.1.0-v1.1.1 as php_56_sos
-FROM wordpress:php${PHP_VERSION}-apache
+FROM wordpress:php5.6-apache
 
 ARG USER_UID=33
 ARG USER_GID=33
 ARG USER_NAME=www-data
 ARG TARGET=wordpress
+ARG CI
 
 # Install wp-cli
 ADD https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar /usr/local/bin/wp
@@ -20,19 +20,27 @@ RUN chmod a+x /usr/local/bin/install-php-extensions && \
     chmod -R a+rwx /usr/local/etc/php/conf.d && \
     install-php-extensions gd pdo pdo_mysql mysqli zip
 
-# Build XDebug and Uopz for PHP 5.6 from source.
-COPY --chmod=0777 php_56_sos/xdebug-2.5.5.tgz /tmp/xdebug-2.5.5.tgz
-COPY --chmod=0777 php_56_sos/uopz-2.0.7.tar.gz /tmp/uopz-2.0.7.tar.gz
-RUN tar xzf /tmp/xdebug-2.5.5.tgz -C /tmp \
-    && mv /tmp/package.xml /tmp/xdebug-2.5.5/package.xml \
-    && ls -la /tmp/xdebug-2.5.5 \
-    && install-php-extensions /tmp/xdebug-2.5.5 \
-    && rm -rf /tmp/xdebug-2.5.5.tgz /tmp/xdebug-2.5.5 \
-    && tar xzf /tmp/uopz-2.0.7.tar.gz -C /tmp \
-    && install-php-extensions /tmp/uopz-2.0.7 \
-    && rm -rf /tmp/uopz-2.0.7.tar.gz /tmp/uopz-2.0.7 \
-    && docker-php-ext-enable xdebug \
-    && if [ "${TARGET}" = "codeception" ]; then docker-php-ext-enable uopz; fi
+# Build XDebug from source if the CI env var is not set.
+RUN if [ -z "${CI}" ]; then \
+        curl -k -o /tmp/xdebug.tgz "https://pecl.php.net/get/xdebug-2.5.5.tgz" && \
+        tar xzf /tmp/xdebug.tgz -C /tmp && \
+        mv /tmp/package.xml /tmp/xdebug-2.5.5 && \
+        rm /tmp/xdebug.tgz && \
+        install-php-extensions /tmp/xdebug-2.5.5 && \
+        rm -rf /tmp/xdebug-2.5.5 && \
+        docker-php-ext-enable xdebug; \
+    fi
+
+# Build Uopz from source if the target is not "wordpress".
+RUN if [ "${TARGET}" != "wordpress" ]; then \
+        curl -k -o /tmp/uopz.tgz "https://pecl.php.net/get/uopz-2.0.7.tgz" && \
+        tar xzf /tmp/uopz.tgz -C /tmp && \
+        mv /tmp/package.xml /tmp/uopz-2.0.7 && \
+        rm /tmp/uopz.tgz && \
+        install-php-extensions /tmp/uopz-2.0.7 && \
+        rm -rf /tmp/uopz-2.0.7 && \
+        docker-php-ext-enable uopz; \
+    fi
 
 # Install required utils
 RUN apt-get update && apt-get install -y \
diff --git a/containers/php/php_56_sos/uopz-2.0.7.tar.gz b/containers/php/php_56_sos/uopz-2.0.7.tar.gz
deleted file mode 100644
index 264b50e41..000000000
Binary files a/containers/php/php_56_sos/uopz-2.0.7.tar.gz and /dev/null differ
diff --git a/containers/php/php_56_sos/xdebug-2.5.5.tgz b/containers/php/php_56_sos/xdebug-2.5.5.tgz
deleted file mode 100644
index d62c7ff63..000000000
Binary files a/containers/php/php_56_sos/xdebug-2.5.5.tgz and /dev/null differ
diff --git a/docker-compose.yml b/docker-compose.yml
index 4604fbec0..743447f78 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,10 @@
 version: "3.8"
 networks:
   test:
-    name: wpbrowser_php_${PHP_VERSION:-5.6}
+    name: wpbrowser_v3
 services:
   database:
-    container_name: wpbrowser_v3_php_${PHP_VERSION:-5.6}_database
+    container_name: wpbrowser_v3_database
     image: mariadb:10.8
     environment:
       MYSQL_ROOT_PASSWORD: password
@@ -21,16 +21,17 @@ services:
     tmpfs:
       - /var/lib/mysql
   wordpress:
-    container_name: wpbrowser_v3_php_${PHP_VERSION:-5.6}_wordpress
+    container_name: wpbrowser_v3_wordpress
     user: "${USER_UID}:${USER_GID}"
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0
-    image: lucatume/wp-browser-v3-build:php${PHP_VERSION:-5.6}-apache
+    image: lucatume/wp-browser-v3-wordpress:php5.6-apache
     build:
       context: ./containers/php
-      dockerfile: "Dockerfile${DOCKERFILE_SUFFIX:-}"
+      dockerfile: "Dockerfile-PHP-5.6"
       args:
-        PHP_VERSION: "${PHP_VERSION:-5.6}"
+        PHP_VERSION: "5.6"
+        WP_IMAGE_VERSION: "5"
         USER_UID: "${USER_UID:-33}"
         USER_GID: "${USER_GID:-33}"
         USER_NAME: "${USER_NAME:-www-data}"
@@ -53,7 +54,7 @@ services:
       - ./var/wordpress:/var/www/html
     working_dir: /var/www/html
   chrome:
-    container_name: wpbrowser_v3_php_${PHP_VERSION:-5.6}_chrome
+    container_name: wpbrowser_v3_chrome
     image: ${DOCKER_CHROME_IMAGE:-selenium/standalone-chrome:116.0-20230912}
     networks:
       - test
@@ -61,15 +62,224 @@ services:
       - wordpress
     ports:
       - "8959:5900"
-  codecept:
-    container_name: wpbrowser_v3_php_${PHP_VERSION:-5.6}_codeception
+  codecept_5.6:
+    container_name: wpbrowser_v3_codecept_php5.6
     user: "${USER_UID}:${USER_GID}"
-    image: lucatume/wp-browser-v3-build:php${PHP_VERSION:-5.6}-codeception
+    image: lucatume/wp-browser-v3-codecept:php5.6
     build:
       context: ./containers/php
-      dockerfile: "Dockerfile${DOCKERFILE_SUFFIX:-}"
+      dockerfile: "Dockerfile-PHP-5.6"
       args:
-        PHP_VERSION: "${PHP_VERSION:-5.6}"
+        PHP_VERSION: "5.6"
+        WP_IMAGE_VERSION: "5"
+        USER_UID: "${USER_UID:-33}"
+        USER_GID: "${USER_GID:-33}"
+        USER_NAME: "${USER_NAME:-www-data}"
+        TARGET: "codeception"
+    depends_on:
+      - database
+      - wordpress
+      - chrome
+    environment:
+      COMPOSER_CACHE_DIR: "${PWD}/var/cache/composer"
+    networks:
+      - test
+    volumes:
+      - "${PWD}:${PWD}"
+    working_dir: "${PWD}"
+    entrypoint: tail -f /dev/null
+  codecept_7.0:
+    container_name: wpbrowser_v3_codecept_php7.0
+    user: "${USER_UID}:${USER_GID}"
+    image: lucatume/wp-browser-v3-codecept:php7.0
+    build:
+      context: ./containers/php
+      dockerfile: "Dockerfile"
+      args:
+        PHP_VERSION: "7.0"
+        WP_IMAGE_VERSION: "5"
+        USER_UID: "${USER_UID:-33}"
+        USER_GID: "${USER_GID:-33}"
+        USER_NAME: "${USER_NAME:-www-data}"
+        TARGET: "codeception"
+    depends_on:
+      - database
+      - wordpress
+      - chrome
+    environment:
+      COMPOSER_CACHE_DIR: "${PWD}/var/cache/composer"
+    networks:
+      - test
+    volumes:
+      - "${PWD}:${PWD}"
+    working_dir: "${PWD}"
+    entrypoint: tail -f /dev/null
+  codecept_7.1:
+    container_name: wpbrowser_v3_codecept_php7.1
+    user: "${USER_UID}:${USER_GID}"
+    image: lucatume/wp-browser-v3-codecept:php7.1
+    build:
+      context: ./containers/php
+      dockerfile: "Dockerfile"
+      args:
+        PHP_VERSION: "7.1"
+        WP_IMAGE_VERSION: "5"
+        USER_UID: "${USER_UID:-33}"
+        USER_GID: "${USER_GID:-33}"
+        USER_NAME: "${USER_NAME:-www-data}"
+        TARGET: "codeception"
+    depends_on:
+      - database
+      - wordpress
+      - chrome
+    environment:
+      COMPOSER_CACHE_DIR: "${PWD}/var/cache/composer"
+    networks:
+      - test
+    volumes:
+      - "${PWD}:${PWD}"
+    working_dir: "${PWD}"
+    entrypoint: tail -f /dev/null
+  codecept_7.2:
+    container_name: wpbrowser_v3_codecept_php7.2
+    user: "${USER_UID}:${USER_GID}"
+    image: lucatume/wp-browser-v3-codecept:php7.2
+    build:
+      context: ./containers/php
+      dockerfile: "Dockerfile"
+      args:
+        PHP_VERSION: "7.2"
+        WP_IMAGE_VERSION: "5"
+        USER_UID: "${USER_UID:-33}"
+        USER_GID: "${USER_GID:-33}"
+        USER_NAME: "${USER_NAME:-www-data}"
+        TARGET: "codeception"
+    depends_on:
+      - database
+      - wordpress
+      - chrome
+    environment:
+      COMPOSER_CACHE_DIR: "${PWD}/var/cache/composer"
+    networks:
+      - test
+    volumes:
+      - "${PWD}:${PWD}"
+    working_dir: "${PWD}"
+    entrypoint: tail -f /dev/null
+  codecept_7.3:
+    container_name: wpbrowser_v3_codecept_php7.3
+    user: "${USER_UID}:${USER_GID}"
+    image: lucatume/wp-browser-v3-codecept:php7.3
+    build:
+      context: ./containers/php
+      dockerfile: "Dockerfile"
+      args:
+        PHP_VERSION: "7.3"
+        WP_IMAGE_VERSION: "5"
+        USER_UID: "${USER_UID:-33}"
+        USER_GID: "${USER_GID:-33}"
+        USER_NAME: "${USER_NAME:-www-data}"
+        TARGET: "codeception"
+    depends_on:
+      - database
+      - wordpress
+      - chrome
+    environment:
+      COMPOSER_CACHE_DIR: "${PWD}/var/cache/composer"
+    networks:
+      - test
+    volumes:
+      - "${PWD}:${PWD}"
+    working_dir: "${PWD}"
+    entrypoint: tail -f /dev/null
+  codecept_7.4:
+    container_name: wpbrowser_v3_codecept_php7.4
+    user: "${USER_UID}:${USER_GID}"
+    image: lucatume/wp-browser-v3-codecept:php7.4
+    build:
+      context: ./containers/php
+      dockerfile: "Dockerfile"
+      args:
+        PHP_VERSION: "7.4"
+        WP_IMAGE_VERSION: "6"
+        USER_UID: "${USER_UID:-33}"
+        USER_GID: "${USER_GID:-33}"
+        USER_NAME: "${USER_NAME:-www-data}"
+        TARGET: "codeception"
+    depends_on:
+      - database
+      - wordpress
+      - chrome
+    environment:
+      COMPOSER_CACHE_DIR: "${PWD}/var/cache/composer"
+    networks:
+      - test
+    volumes:
+      - "${PWD}:${PWD}"
+    working_dir: "${PWD}"
+    entrypoint: tail -f /dev/null
+  codecept_8.0:
+    container_name: wpbrowser_v3_codecept_php8.0
+    user: "${USER_UID}:${USER_GID}"
+    image: lucatume/wp-browser-v3-codecept:php8.0
+    build:
+      context: ./containers/php
+      dockerfile: "Dockerfile"
+      args:
+        PHP_VERSION: "8.0"
+        WP_IMAGE_VERSION: "6"
+        USER_UID: "${USER_UID:-33}"
+        USER_GID: "${USER_GID:-33}"
+        USER_NAME: "${USER_NAME:-www-data}"
+        TARGET: "codeception"
+    depends_on:
+      - database
+      - wordpress
+      - chrome
+    environment:
+      COMPOSER_CACHE_DIR: "${PWD}/var/cache/composer"
+    networks:
+      - test
+    volumes:
+      - "${PWD}:${PWD}"
+    working_dir: "${PWD}"
+    entrypoint: tail -f /dev/null
+  codecept_8.1:
+    container_name: wpbrowser_v3_codecept_php8.1
+    user: "${USER_UID}:${USER_GID}"
+    image: lucatume/wp-browser-v3-codecept:php8.1
+    build:
+      context: ./containers/php
+      dockerfile: "Dockerfile"
+      args:
+        PHP_VERSION: "8.1"
+        WP_IMAGE_VERSION: "6"
+        USER_UID: "${USER_UID:-33}"
+        USER_GID: "${USER_GID:-33}"
+        USER_NAME: "${USER_NAME:-www-data}"
+        TARGET: "codeception"
+    depends_on:
+      - database
+      - wordpress
+      - chrome
+    environment:
+      COMPOSER_CACHE_DIR: "${PWD}/var/cache/composer"
+    networks:
+      - test
+    volumes:
+      - "${PWD}:${PWD}"
+    working_dir: "${PWD}"
+    entrypoint: tail -f /dev/null
+  codecept_8.2:
+    container_name: wpbrowser_v3_codecept_php8.2
+    user: "${USER_UID}:${USER_GID}"
+    image: lucatume/wp-browser-v3-codecept:php8.2
+    build:
+      context: ./containers/php
+      dockerfile: "Dockerfile"
+      args:
+        PHP_VERSION: "8.2"
+        WP_IMAGE_VERSION: "6"
         USER_UID: "${USER_UID:-33}"
         USER_GID: "${USER_GID:-33}"
         USER_NAME: "${USER_NAME:-www-data}"
diff --git a/src/Codeception/Lib/Generator/WPUnit.php b/src/Codeception/Lib/Generator/WPUnit.php
index 42ae09ffc..6e0310090 100644
--- a/src/Codeception/Lib/Generator/WPUnit.php
+++ b/src/Codeception/Lib/Generator/WPUnit.php
@@ -11,6 +11,7 @@
 use Codeception\Lib\Generator\Shared\Classname;
 use Codeception\Util\Shared\Namespaces;
 use Codeception\Util\Template;
+use PHPUnit\Runner\Version;
 use tad\WPBrowser\Compat\Compatibility;
 
 /**
@@ -74,13 +75,6 @@ public function test_it_works()
 
 EOF;
 
-    /**
-     * The injectable compatibility layer.
-     *
-     * @var Compatibility
-     */
-    protected $compatibilityLayer;
-
     /**
      * WPUnit constructor.
      *
@@ -94,7 +88,6 @@ public function __construct($settings, $name, $baseClass)
         $this->settings = $settings;
         $this->name = $this->removeSuffix($name, 'Test');
         $this->baseClass = $baseClass;
-        $this->compatibilityLayer = new Compatibility();
     }
 
     /**
@@ -106,7 +99,7 @@ public function produce()
     {
         $ns = $this->getNamespaceHeader($this->settings['namespace'] . '\\' . $this->name);
 
-        $phpunitSeries = $this->compatibilityLayer->phpunitVersion();
+        $phpunitSeries = Version::series();
 
         /** @var string $phpunitSeries */
         $voidReturnType = is_string($phpunitSeries) && version_compare($phpunitSeries, '8.0', '<') ?
@@ -155,16 +148,4 @@ protected function getTester()
 
         return ltrim($testerFrag);
     }
-
-    /**
-     * Injects the compatibility layer object.
-     *
-     * @param Compatibility $compatibility An instance of the compatibility layer.
-     *
-     * @return void
-     */
-    public function setCompatibilityLayer(Compatibility $compatibility)
-    {
-        $this->compatibilityLayer = $compatibility;
-    }
 }
diff --git a/src/Codeception/TestCase/WPTestCase.php b/src/Codeception/TestCase/WPTestCase.php
index c64cba188..0aa05dd01 100644
--- a/src/Codeception/TestCase/WPTestCase.php
+++ b/src/Codeception/TestCase/WPTestCase.php
@@ -28,10 +28,10 @@
 use function version_compare;
 
 if (!class_exists('WP_UnitTest_Factory')) {
-    require_once dirname(dirname(dirname(__FILE__))) . '/includes/factory.php';
+    require_once dirname(dirname( __DIR__ )) . '/includes/factory.php';
 }
 if (!class_exists('TracTickets')) {
-    require_once dirname(dirname(dirname(__FILE__))) . '/includes/trac.php';
+    require_once dirname(dirname( __DIR__ )) . '/includes/trac.php';
 }
 
 /*
@@ -49,22 +49,6 @@
     setupPhpunitBootstrapGlobal();
 }
 
-// Load the PHPUnit compatibility layer.
-// @phpstan-ignore-next-line
-if (version_compare(Codecept::VERSION, '3.0.0', '<')) {
-    class_alias(
-        '\\tad\WPBrowser\\Compat\\Codeception\\Version2\\Unit',
-        '\\tad\\WPBrowser\\Compat\\Codeception\\Unit'
-    );
-} else {
-    class_alias(
-        '\\Codeception\\Test\\Unit',
-        '\\tad\\WPBrowser\\Compat\\Codeception\\Unit'
-    );
-}
-// phpcs:enable
-
-
 /**
  * Defines a basic fixture to run multiple tests.
  *
@@ -74,7 +58,7 @@ class_alias(
  *
  * All WordPress unit/integrations tests should inherit from this class.
  */
-class WPTestCase extends \tad\WPBrowser\Compat\Codeception\Unit
+class WPTestCase extends Unit
 {
 
     use WithCodeceptionTestCaseEnhancements;
@@ -277,15 +261,7 @@ public function _setUp()
 
         $this->maybeEnhanceTestCaseIfWoDiService();
 
-        /**
-         * After WordPress has been initialized in the test context initialize the Codeception Unit test case.
-         * Check on what methods `\Codeception\Test\Unit` provides to call the correct one depending on the PHPUnit and
-         * Codeception versions.
-         */
-        $unitSetupMethod = Compatibility::setupMethodFor(Unit::class);
-        if (method_exists(Unit::class, $unitSetupMethod)) {
-            Unit::{$unitSetupMethod}();
-        }
+		Unit::_setUp();
     }
 
     public function scan_user_uploads()
@@ -512,6 +488,8 @@ public function _tearDown()
         $this->_restore_hooks();
         wp_set_current_user(0);
         $this->requestTimeTearDown();
+
+		Unit::_tearDown();
     }
 
     /**
diff --git a/src/tad/WPBrowser/Compat/Codeception/Version2/Unit.php b/src/tad/WPBrowser/Compat/Codeception/Version2/Unit.php
deleted file mode 100644
index f2cc48170..000000000
--- a/src/tad/WPBrowser/Compat/Codeception/Version2/Unit.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * An extension of Codeception Unit TestCase to cover all methods required by the test cases to work.
- * This specific file will be loaded when the loaded version of Codeception is < 3.0.
- *
- * @package tad\WPBrowser\Compat\Codeception\Version2
- */
-
-namespace tad\WPBrowser\Compat\Codeception\Version2;
-
-/**
- * Class Unit
- *
- * @package tad\WPBrowser\Compat\Codeception\Version2
- */
-class Unit extends \Codeception\Test\Unit
-{
-    public static function setUpBeforeClass()
-    {
-        if (method_exists(static::class, '_setUpBeforeClass')) {
-            static::_setUpBeforeClass();
-        }
-    }
-
-    public static function tearDownAfterClass()
-    {
-        if (method_exists(static::class, '_tearDownAfterClass')) {
-            static::_tearDownAfterClass();
-        }
-    }
-    protected function assertPreConditions()
-    {
-        if (method_exists(static::class, '_assertPreConditions')) {
-            static::_assertPreConditions();
-        }
-    }
-    protected function assertPostConditions()
-    {
-        if (method_exists(static::class, '_assertPostConditions')) {
-            static::_assertPostConditions();
-        }
-    }
-
-    protected function setUp()
-    {
-        if (method_exists($this, '_setUp')) {
-            $this->_setUp();
-        }
-    }
-
-    protected function tearDown()
-    {
-        if (method_exists($this, '_tearDown')) {
-            $this->_tearDown();
-        }
-    }
-}
diff --git a/src/tad/WPBrowser/Compat/Compatibility.php b/src/tad/WPBrowser/Compat/Compatibility.php
deleted file mode 100644
index e00456529..000000000
--- a/src/tad/WPBrowser/Compat/Compatibility.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Handles the compatibility with different PHP, PHPUnit, Codeception and PHPUnit wrappers.
- *
- * @package tad\WPBrowser\Compat
- */
-
-namespace tad\WPBrowser\Compat;
-
-use function tad\WPBrowser\phpunitVersion;
-
-/**
- * Class Compatibility
- *
- * @package tad\WPBrowser\Compat
- */
-class Compatibility
-{
-
-    /**
-     * Returns the first existing setUp method for a base test case class.
-     *
-     * This method is required to handle with different PHP, PHPUnit, Codeception and Codeception PHPUnit wrapper
-     * versions.
-     *
-     * @param string $class The fully-qualified name of the class to return the set up method for.
-     *
-     * @return string The class setup method name; default to the PHPUnit default `setUp` if not found.
-     */
-    public static function setupMethodFor($class)
-    {
-        return method_exists($class, '_setUp') ? '_setUp' : 'setUp';
-    }
-
-    /**
-     * Returns the PHPUnit version currently installed.
-     *
-     * Falls back on version 5 if none can be found.
-     *
-     * @return string The current PHPUnit version.
-     */
-    public function phpunitVersion()
-    {
-        return phpunitVersion();
-    }
-}
diff --git a/tests/unit/Codeception/Lib/Generator/WPUnitTest.php b/tests/unit/Codeception/Lib/Generator/WPUnitTest.php
index 8d0232363..a3d1e2c72 100644
--- a/tests/unit/Codeception/Lib/Generator/WPUnitTest.php
+++ b/tests/unit/Codeception/Lib/Generator/WPUnitTest.php
@@ -1,118 +1,120 @@
 <?php namespace Codeception\Lib\Generator;
 
 use Codeception\TestCase\WPTestCase;
+use lucatume\WPBrowser\Tests\Traits\WithUopz;
+use PHPUnit\Runner\Version;
+use ReflectionClass;
 use tad\Codeception\SnapshotAssertions\SnapshotAssertions;
 use tad\WPBrowser\Compat\Compatibility;
 
-class WPUnitTest extends \Codeception\Test\Unit
-{
-
-    use SnapshotAssertions;
-
-    /**
-     * A backup of the current PHPUnit Series env var.
-     * @var array|false|string
-     */
-    protected $phpunitSeriesEnv;
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
-    protected $compatibility;
-
-    /**
-     * It should scaffold PHPUnit v8 compatible code on series 8
-     *
-     * @test
-     * @dataProvider phpUnitEq8Series
-     */
-    public function should_scaffold_php_unit_v_8_code_on_series_8($series)
-    {
-        $this->setPhpUnitSeriesTo('8.0');
-        $settings = ['namespace' => 'Acme'];
-        $name = 'SomeClass';
-        $generator = new WPUnit($settings, $name, WPTestCase::class);
-        $generator->setCompatibilityLayer($this->compatibility);
-
-        $code = $generator->produce();
-
-        $this->assertMatchesCodeSnapshot($code, 'php');
-    }
-
-    protected function setPhpUnitSeriesTo($series)
-    {
-        $this->compatibility = $this->make(Compatibility::class, [
-            'phpunitVersion' => $series
-        ]);
-    }
-
-    public function phpUnitLt8Series()
-    {
-        return [
-            '5.5' => ['5.5'],
-            '5.5.5' => ['5.5'],
-            '6.2' => ['6.2'],
-            '6.2.3' => ['6.2'],
-            '7.5' => ['7.5'],
-            '7.5.6' => ['7.5'],
-        ];
-    }
-
-    /**
-     * It should scaffold PHPUnit lt 8.0 compatible code on series lt 8
-     *
-     * @test
-     * @dataProvider phpUnitLt8Series
-     */
-    public function should_scaffold_php_unit_lt_8_0_compatible_code_on_series_lt_8($series)
-    {
-        $this->setPhpUnitSeriesTo($series);
-        $settings = ['namespace' => 'Acme'];
-        $name = 'SomeClass';
-        $generator = new WPUnit($settings, $name, WPTestCase::class);
-        $generator->setCompatibilityLayer($this->compatibility);
-
-        $code = $generator->produce();
-
-        $this->assertMatchesCodeSnapshot($code, 'php');
-    }
-
-    /**
-     * It should correctly add the tester property if actor is set in the settings
-     *
-     * @test
-     */
-    public function should_correctly_add_the_tester_property_if_actor_is_set_in_the_settings()
-    {
-        $this->setPhpUnitSeriesTo('6.0');
-        $settings = ['namespace' => 'Acme', 'actor' => 'Fixer'];
-        $name = 'SomeClass';
-        $generator = new WPUnit($settings, $name, WPTestCase::class);
-        $generator->setCompatibilityLayer($this->compatibility);
-
-        $code = $generator->produce();
-
-        $this->assertMatchesCodeSnapshot($code, 'php');
-    }
-
-    public function phpUnitEq8Series()
-    {
-        return [
-            '8.0' => ['8.0'],
-            '8.0.4' => ['8.0.4'],
-            '8.1' => ['8.1'],
-            '8.1.6' => ['8.1.6'],
-        ];
-    }
-
-    protected function _before()
-    {
-        $this->phpunitSeriesEnv = getenv('WPBROWSER_PHPUNIT_SERIES');
-    }
-
-    protected function _after()
-    {
-        putenv('WPBROWSER_PHPUNIT_SERIES='.$this->phpunitSeriesEnv);
-    }
+class WPUnitTest extends \Codeception\Test\Unit {
+	use WithUopz;
+	use SnapshotAssertions;
+
+	/**
+	 * A backup of the current PHPUnit Series env var.
+	 * @var array|false|string
+	 */
+	protected $phpunitSeriesEnv;
+	/**
+	 * @var \UnitTester
+	 */
+	protected $tester;
+
+	/**
+	 * @var string
+	 */
+	private $phpunitVersionPropertyBackup = null;
+
+	private function setPhpUnitSeriesTo( $series ) {
+		$reflectionClass = new ReflectionClass( Version::class );
+		$versionProp     = $reflectionClass->getProperty( 'version' );
+		$versionProp->setAccessible( true );
+		$this->phpunitVersionPropertyBackup = $versionProp->getValue();
+		$versionProp->setValue( $series );
+	}
+
+	/**
+	 * @after
+	 */
+	public function restorePhpunitVersionProperty() {
+		if ( null === $this->phpunitVersionPropertyBackup ) {
+			return;
+		}
+		$reflectionClass = new ReflectionClass( Version::class );
+		$versionProp     = $reflectionClass->getProperty( 'version' );
+		$versionProp->setAccessible( true );
+		$versionProp->setValue( $this->phpunitVersionPropertyBackup );
+		$this->phpunitVersionPropertyBackup = null;
+	}
+
+	/**
+	 * It should scaffold PHPUnit v8 compatible code on series 8
+	 *
+	 * @test
+	 * @dataProvider phpUnitEq8Series
+	 */
+	public function should_scaffold_php_unit_v_8_code_on_series_8( $series ) {
+		$this->setPhpUnitSeriesTo( '8.0' );
+		$settings = [ 'namespace' => 'Acme' ];
+		$name     = 'SomeClass';
+
+		$generator = new WPUnit( $settings, $name, WPTestCase::class );
+		$code      = $generator->produce();
+
+		$this->assertMatchesCodeSnapshot( $code, 'php' );
+	}
+
+	public function phpUnitLt8Series() {
+		return [
+			'5.5'   => [ '5.5' ],
+			'5.5.5' => [ '5.5' ],
+			'6.2'   => [ '6.2' ],
+			'6.2.3' => [ '6.2' ],
+			'7.5'   => [ '7.5' ],
+			'7.5.6' => [ '7.5' ],
+		];
+	}
+
+	/**
+	 * It should scaffold PHPUnit lt 8.0 compatible code on series lt 8
+	 *
+	 * @test
+	 * @dataProvider phpUnitLt8Series
+	 */
+	public function should_scaffold_php_unit_lt_8_0_compatible_code_on_series_lt_8( $series ) {
+		$this->setPhpUnitSeriesTo( $series );
+		$settings = [ 'namespace' => 'Acme' ];
+		$name     = 'SomeClass';
+
+		$generator = new WPUnit( $settings, $name, WPTestCase::class );
+		$code      = $generator->produce();
+
+		$this->assertMatchesCodeSnapshot( $code, 'php' );
+	}
+
+	/**
+	 * It should correctly add the tester property if actor is set in the settings
+	 *
+	 * @test
+	 */
+	public function should_correctly_add_the_tester_property_if_actor_is_set_in_the_settings() {
+		$this->setPhpUnitSeriesTo( '6.0' );
+		$settings = [ 'namespace' => 'Acme', 'actor' => 'Fixer' ];
+		$name     = 'SomeClass';
+
+		$generator = new WPUnit( $settings, $name, WPTestCase::class );
+		$code      = $generator->produce();
+
+		$this->assertMatchesCodeSnapshot( $code, 'php' );
+	}
+
+	public function phpUnitEq8Series() {
+		return [
+			'8.0'   => [ '8.0' ],
+			'8.0.4' => [ '8.0.4' ],
+			'8.1'   => [ '8.1' ],
+			'8.1.6' => [ '8.1.6' ],
+		];
+	}
 }
diff --git a/tests/wploadersuite/BeforeAfterMethodsTest.php b/tests/wploadersuite/BeforeAfterMethodsTest.php
new file mode 100644
index 000000000..d83b24d73
--- /dev/null
+++ b/tests/wploadersuite/BeforeAfterMethodsTest.php
@@ -0,0 +1,24 @@
+<?php
+
+use PHPUnit\Framework\Assert;
+
+class BeforeAfterMethodsTest extends \Codeception\TestCase\WPTestCase {
+	private static $staticCanary = true;
+	private $canary = false;
+
+	public function _before() {
+		$this->canary = true;
+	}
+
+	public function _after() {
+		self::$staticCanary = false;
+	}
+
+	public static function wpTearDownAfterClass() {
+		Assert::assertFalse( self::$staticCanary );
+	}
+
+	public function test_before_method_is_loaded() {
+		$this->assertTrue( $this->canary );
+	}
+}