diff --git a/src/test/resources/run-s3-tests.sh b/src/test/resources/run-s3-tests.sh
index 421b14ec..2b794dfe 100755
--- a/src/test/resources/run-s3-tests.sh
+++ b/src/test/resources/run-s3-tests.sh
@@ -3,6 +3,7 @@
 set -o errexit
 set -o nounset
 
+# TODO: override from the environment?
 S3PROXY_CONF="${1-s3proxy.conf}"
 S3PROXY_BIN="${PWD}/target/s3proxy"
 S3PROXY_PORT="${S3PROXY_PORT:-8081}"
@@ -61,4 +62,5 @@ fi
 
 # execute s3-tests
 pushd s3-tests
-tox -- -m "${tags}"
+shift
+tox -- -m "${tags}" $*