diff --git a/testsuite/dockerdata/test-container-entrypoint b/testsuite/dockerdata/test-container-entrypoint
index 4f3f43b7..aa3def79 100755
--- a/testsuite/dockerdata/test-container-entrypoint
+++ b/testsuite/dockerdata/test-container-entrypoint
@@ -58,7 +58,7 @@ EOF
 done
 
 case "$args" in
-*testsuite/citest.py*)
+*testsuite/*.py*)
 	;;
 *)
 	args="$args testsuite/citest.py"
diff --git a/testsuite/dockerdata/version b/testsuite/dockerdata/version
index 0cfbf088..00750edc 100644
--- a/testsuite/dockerdata/version
+++ b/testsuite/dockerdata/version
@@ -1 +1 @@
-2
+3