diff --git a/20-minimal/.exclude-fedora b/20-minimal/.exclude-fedora
new file mode 100644
index 00000000..e69de29b
diff --git a/20/.exclude-fedora b/20/.exclude-fedora
new file mode 100644
index 00000000..e69de29b
diff --git a/22-minimal/.exclude-fedora b/22-minimal/.exclude-fedora
new file mode 100644
index 00000000..e69de29b
diff --git a/22/.exclude-fedora b/22/.exclude-fedora
new file mode 100644
index 00000000..e69de29b
diff --git a/README.md b/README.md
index 1c7bb12f..e013c1ba 100644
--- a/README.md
+++ b/README.md
@@ -26,10 +26,10 @@ Table start
 -->
 ||CentOS Stream 9|CentOS Stream 10|Fedora|RHEL 8|RHEL 9|RHEL 10|
 |:--|:--:|:--:|:--:|:--:|:--:|:--:|
-|20|<details><summary>✓</summary>`quay.io/sclorg/nodejs-20-c9s`</details>||<details><summary>✓</summary>`quay.io/fedora/nodejs-20`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-20`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-20`</details>||
-|20-minimal|<details><summary>✓</summary>`quay.io/sclorg/nodejs-20-minimal-c9s`</details>||<details><summary>✓</summary>`quay.io/fedora/nodejs-20-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-20-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-20-minimal`</details>||
-|22||<details><summary>✓</summary>`quay.io/sclorg/nodejs-22-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/nodejs-22`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-22`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-22`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/nodejs-22`</details>|
-|22-minimal||<details><summary>✓</summary>`quay.io/sclorg/nodejs-22-minimal-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/nodejs-22-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-22-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-22-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/nodejs-22-minimal`</details>|
+|20|<details><summary>✓</summary>`quay.io/sclorg/nodejs-20-c9s`</details>|||<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-20`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-20`</details>||
+|20-minimal|<details><summary>✓</summary>`quay.io/sclorg/nodejs-20-minimal-c9s`</details>|||<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-20-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-20-minimal`</details>||
+|22||<details><summary>✓</summary>`quay.io/sclorg/nodejs-22-c10s`</details>||<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-22`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-22`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/nodejs-22`</details>|
+|22-minimal||<details><summary>✓</summary>`quay.io/sclorg/nodejs-22-minimal-c10s`</details>||<details><summary>✓</summary>`registry.redhat.io/rhel8/nodejs-22-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-22-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/nodejs-22-minimal`</details>|
 |24|<details><summary>✓</summary>`quay.io/sclorg/nodejs-24-c9s`</details>|<details><summary>✓</summary>`quay.io/sclorg/nodejs-24-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/nodejs-24`</details>||<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-24`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/nodejs-24`</details>|
 |24-minimal|<details><summary>✓</summary>`quay.io/sclorg/nodejs-24-minimal-c9s`</details>|<details><summary>✓</summary>`quay.io/sclorg/nodejs-24-minimal-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/nodejs-24-minimal`</details>||<details><summary>✓</summary>`registry.redhat.io/rhel9/nodejs-24-minimal`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/nodejs-24-minimal`</details>|
 <!--
diff --git a/test/run-pytest b/test/run-pytest
index 35fca679..712e47a8 100755
--- a/test/run-pytest
+++ b/test/run-pytest
@@ -8,8 +8,9 @@
 
 THISDIR=$(dirname ${BASH_SOURCE[0]})
 
-PYTHON_VERSION="3.12"
-if [[ ! -f "/usr/bin/python$PYTHON_VERSION" ]]; then
-  PYTHON_VERSION="3.13"
+if python3 -c 'import sys; sys.exit(0 if sys.version_info < (3,13) else 1)'; then
+  PYTHON_VERSION="3.12"
+else
+  PYTHON_VERSION="3"
 fi
 cd "${THISDIR}" && "python${PYTHON_VERSION}" -m pytest -s -rA --showlocals -vv test_container_*.py
diff --git a/test/test-lib-nodejs.sh b/test/test-lib-nodejs.sh
index b000e77f..4fe938ab 100644
--- a/test/test-lib-nodejs.sh
+++ b/test/test-lib-nodejs.sh
@@ -57,11 +57,11 @@ run_s2i_build_client() {
   ct_s2i_build_as_df_build_args \
     "file://${test_dir}/$1" "${IMAGE_NAME}" "${IMAGE_NAME}-$1" "--ulimit nofile=4096:4096" \
     ${s2i_args} \
-    $(ct_build_s2i_npm_variables) -e NODE_ENV=development
+    $(ct_build_s2i_npm_variables) -e NODE_ENV=development -e CI=true
 }
 
 run_s2i_build_binary() {
-  ct_s2i_build_as_df file://${test_dir}/test-binary ${IMAGE_NAME} ${IMAGE_NAME}-testbinary ${s2i_args} $(ct_build_s2i_npm_variables) $1
+  ct_s2i_build_as_df file://${test_dir}/test-binary ${IMAGE_NAME} ${IMAGE_NAME}-testbinary ${s2i_args} $(ct_build_s2i_npm_variables) $1  -e CI=true
 }
 
 run_s2i_multistage_build() {
@@ -186,7 +186,7 @@ run_client_test_suite() {
   local cmd="npm test"
   # Skip style check tests
   [ "$1" == "prom-client" ] && cmd="sed -i.bak 's/&& npm run check-prettier //g' package.json && $cmd"
-  docker run --user=100001 $(ct_mount_ca_file) --rm --cidfile=${cid_file} ${IMAGE_NAME}-$1 bash -c "$cmd"
+  docker run --user=100001 $(ct_mount_ca_file) -e CI=true --rm --cidfile=${cid_file} ${IMAGE_NAME}-$1 bash -c "$cmd"
 }
 
 kill_test_application() {