diff --git a/Dockerfile b/Dockerfile
index aa03755d..9361e457 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,4 +39,4 @@ ENV PATH=/opt/firebird/bin:$PATH
 ENV TERMINFO_DIRS=/lib/terminfo
 ENV LD_LIBRARY_PATH=/opt/firebird/lib
 
-CMD /qa/docker/run.sh
+ENTRYPOINT ["/qa/docker/run.sh"]
diff --git a/docker/run.sh b/docker/run.sh
index 18b31eff..10c687fd 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -14,7 +14,6 @@ pytest \
 	-vv \
 	--tb=long \
 	--basetemp=/tmp/pytest-tmp \
-	--timeout 250 \
 	--md-report \
 	--md-report-flavor gfm \
 	--md-report-verbose 1 \
@@ -22,4 +21,5 @@ pytest \
 	--md-report-output /qa-out/md_report.md \
 	--ignore=tests/functional/replication \
 	--ignore=tests/functional/basic/isql/test_08.py \
-	./tests/
+	-m "not replication" \
+	"$@"
diff --git a/run-docker.sh b/run-docker.sh
index 2cc56502..5d5322c3 100755
--- a/run-docker.sh
+++ b/run-docker.sh
@@ -22,4 +22,4 @@ fi
 
 docker build --build-arg UID=$(id -u) --build-arg GID=$(id -g) --progress=plain -t firebird-qa $THIS_DIR
 mkdir -p $FBQA_OUT/tests
-docker run --user $(id -u) --rm -v `realpath $FBQA_OUT`:/qa-out -v `realpath $FBQA_OUT/tests`:/qa-run/out/tests -v `realpath $THIS_DIR`:/qa -v `realpath $FBQA_INSTALLER`:/firebird-installer.tar.gz firebird-qa
+docker run --user $(id -u) --rm -v `realpath $FBQA_OUT`:/qa-out -v `realpath $FBQA_OUT/tests`:/qa-run/out/tests -v `realpath $THIS_DIR`:/qa -v `realpath $FBQA_INSTALLER`:/firebird-installer.tar.gz firebird-qa "$@"