diff --git a/Dockerfile b/Dockerfile
index 5ae2baacc..2a2bd70b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM composer/composer:latest-bin AS composer
 
-FROM php:8.3-cli as php
+FROM php:8.3-cli
 
 # System packages
 
diff --git a/Makefile b/Makefile
index 74bc5a87f..0695f932b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,37 @@
 run:
-	docker compose run --user root --rm --entrypoint $(CMD) php
+	docker compose run \
+	--rm \
+	--entrypoint $(CMD) \
+	php
 
-test-all: test-sqlite \
-	test-mysql \
-	test-mariadb \
-	test-pgsql \
-	test-mssql \
-	test-oracle
-test-sqlite: testsuite-Sqlite
-test-mysql: testsuite-Mysql
-test-mariadb:
+test-driver-all: test-driver-sqlite \
+	test-driver-mysql \
+	test-driver-mariadb \
+	test-driver-pgsql \
+	test-driver-mssql \
+	test-driver-oracle
+test-driver-sqlite: testsuite-Sqlite
+test-driver-mysql: testsuite-Mysql
+test-driver-mariadb:
 	docker compose run \
 	--rm \
-	--entrypoint "vendor/bin/phpunit --testsuite Mysql" \
+	--entrypoint "vendor/bin/phpunit --testsuite Mysql $(RUN_ARGS)" \
 	-e YII_MYSQL_TYPE=mariadb \
 	php
-test-pgsql: testsuite-Pgsql
-test-mssql: testsuite-Mssql
-test-oracle:
+test-driver-pgsql: testsuite-Pgsql
+test-driver-mssql: testsuite-Mssql
+test-driver-oracle:
 	docker compose run \
-	--user root \
-	--workdir /code \
 	--rm \
 	--entrypoint "bash -c -l 'vendor/bin/phpunit --testsuite Oracle $(RUN_ARGS)'" \
-	php-oracle
+	php
 
 testsuite-%:
 	docker compose run \
 	--rm \
-	--entrypoint "vendor/bin/phpunit --testsuite $(subst testsuite-,,$@)" \
+	--entrypoint "vendor/bin/phpunit --testsuite $(subst testsuite-,,$@) $(RUN_ARGS)" \
 	php
 
-# --filter showDatabases vendor/yiisoft/db-mssql/tests/CommandTest.php
-
 static-analysis: CMD="vendor/bin/psalm --no-cache"
 static-analysis: run
 
diff --git a/docs/internals.md b/docs/internals.md
index 1d151b86e..9afe6c3e5 100644
--- a/docs/internals.md
+++ b/docs/internals.md
@@ -64,6 +64,10 @@ Suites available:
 - Pgsql
 - Sqlite
 
+```shell
+make test-oracle RUN_ARGS="--group temp"
+```
+
 ## Static analysis
 
 The code is statically analyzed with [Psalm](https://psalm.dev/). To run static analysis: