diff --git a/5.038.005-main,threaded-bookworm/Dockerfile b/5.038.005-main,threaded-bookworm/Dockerfile
index 52bf932e..c57ab15e 100644
--- a/5.038.005-main,threaded-bookworm/Dockerfile
+++ b/5.038.005-main,threaded-bookworm/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.038.005-main,threaded-bullseye/Dockerfile b/5.038.005-main,threaded-bullseye/Dockerfile
index b99cc20d..0a62c5ad 100644
--- a/5.038.005-main,threaded-bullseye/Dockerfile
+++ b/5.038.005-main,threaded-bullseye/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.038.005-main,threaded-trixie/Dockerfile b/5.038.005-main,threaded-trixie/Dockerfile
index 23f258cd..5feedab5 100644
--- a/5.038.005-main,threaded-trixie/Dockerfile
+++ b/5.038.005-main,threaded-trixie/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.038.005-main-bookworm/Dockerfile b/5.038.005-main-bookworm/Dockerfile
index 714e97ca..92d972ce 100644
--- a/5.038.005-main-bookworm/Dockerfile
+++ b/5.038.005-main-bookworm/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.038.005-main-bullseye/Dockerfile b/5.038.005-main-bullseye/Dockerfile
index 23beacce..303980f8 100644
--- a/5.038.005-main-bullseye/Dockerfile
+++ b/5.038.005-main-bullseye/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.038.005-main-trixie/Dockerfile b/5.038.005-main-trixie/Dockerfile
index 5bc39ab7..b5b30e81 100644
--- a/5.038.005-main-trixie/Dockerfile
+++ b/5.038.005-main-trixie/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.038.005-slim,threaded-bookworm/Dockerfile b/5.038.005-slim,threaded-bookworm/Dockerfile
index 7f09e93a..070a21ea 100644
--- a/5.038.005-slim,threaded-bookworm/Dockerfile
+++ b/5.038.005-slim,threaded-bookworm/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.038.005-slim,threaded-bullseye/Dockerfile b/5.038.005-slim,threaded-bullseye/Dockerfile
index ce76405f..4adbde97 100644
--- a/5.038.005-slim,threaded-bullseye/Dockerfile
+++ b/5.038.005-slim,threaded-bullseye/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.038.005-slim,threaded-trixie/Dockerfile b/5.038.005-slim,threaded-trixie/Dockerfile
index cdbdd39a..9e409ad3 100644
--- a/5.038.005-slim,threaded-trixie/Dockerfile
+++ b/5.038.005-slim,threaded-trixie/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.038.005-slim-bookworm/Dockerfile b/5.038.005-slim-bookworm/Dockerfile
index 523e1fb1..469d7d2a 100644
--- a/5.038.005-slim-bookworm/Dockerfile
+++ b/5.038.005-slim-bookworm/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.038.005-slim-bullseye/Dockerfile b/5.038.005-slim-bullseye/Dockerfile
index 76a8164d..993afe33 100644
--- a/5.038.005-slim-bullseye/Dockerfile
+++ b/5.038.005-slim-bullseye/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.038.005-slim-trixie/Dockerfile b/5.038.005-slim-trixie/Dockerfile
index 37847795..797ffb92 100644
--- a/5.038.005-slim-trixie/Dockerfile
+++ b/5.038.005-slim-trixie/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.040.003-main,threaded-bookworm/Dockerfile b/5.040.003-main,threaded-bookworm/Dockerfile
index 000873ca..543f2766 100644
--- a/5.040.003-main,threaded-bookworm/Dockerfile
+++ b/5.040.003-main,threaded-bookworm/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.040.003-main,threaded-bullseye/Dockerfile b/5.040.003-main,threaded-bullseye/Dockerfile
index 63fca23e..07429020 100644
--- a/5.040.003-main,threaded-bullseye/Dockerfile
+++ b/5.040.003-main,threaded-bullseye/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.040.003-main,threaded-trixie/Dockerfile b/5.040.003-main,threaded-trixie/Dockerfile
index 07d13700..2abdf03d 100644
--- a/5.040.003-main,threaded-trixie/Dockerfile
+++ b/5.040.003-main,threaded-trixie/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.040.003-main-bookworm/Dockerfile b/5.040.003-main-bookworm/Dockerfile
index a422a690..af58492c 100644
--- a/5.040.003-main-bookworm/Dockerfile
+++ b/5.040.003-main-bookworm/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.040.003-main-bullseye/Dockerfile b/5.040.003-main-bullseye/Dockerfile
index 5612ca2c..6bb2f18e 100644
--- a/5.040.003-main-bullseye/Dockerfile
+++ b/5.040.003-main-bullseye/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.040.003-main-trixie/Dockerfile b/5.040.003-main-trixie/Dockerfile
index 7387c8d4..9895740e 100644
--- a/5.040.003-main-trixie/Dockerfile
+++ b/5.040.003-main-trixie/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.040.003-slim,threaded-bookworm/Dockerfile b/5.040.003-slim,threaded-bookworm/Dockerfile
index bc3bffb5..90159ec2 100644
--- a/5.040.003-slim,threaded-bookworm/Dockerfile
+++ b/5.040.003-slim,threaded-bookworm/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.040.003-slim,threaded-bullseye/Dockerfile b/5.040.003-slim,threaded-bullseye/Dockerfile
index 4f544332..0f7338c8 100644
--- a/5.040.003-slim,threaded-bullseye/Dockerfile
+++ b/5.040.003-slim,threaded-bullseye/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.040.003-slim,threaded-trixie/Dockerfile b/5.040.003-slim,threaded-trixie/Dockerfile
index bf26ada2..e5d245f0 100644
--- a/5.040.003-slim,threaded-trixie/Dockerfile
+++ b/5.040.003-slim,threaded-trixie/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.040.003-slim-bookworm/Dockerfile b/5.040.003-slim-bookworm/Dockerfile
index 0452f281..ff9f6246 100644
--- a/5.040.003-slim-bookworm/Dockerfile
+++ b/5.040.003-slim-bookworm/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.040.003-slim-bullseye/Dockerfile b/5.040.003-slim-bullseye/Dockerfile
index ddb8f5c4..f80e7bc4 100644
--- a/5.040.003-slim-bullseye/Dockerfile
+++ b/5.040.003-slim-bullseye/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.040.003-slim-trixie/Dockerfile b/5.040.003-slim-trixie/Dockerfile
index ccd127f6..63a5c5ae 100644
--- a/5.040.003-slim-trixie/Dockerfile
+++ b/5.040.003-slim-trixie/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.042.000-main,threaded-bookworm/Dockerfile b/5.042.000-main,threaded-bookworm/Dockerfile
index 58bf5092..f806220e 100644
--- a/5.042.000-main,threaded-bookworm/Dockerfile
+++ b/5.042.000-main,threaded-bookworm/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.042.000-main,threaded-bullseye/Dockerfile b/5.042.000-main,threaded-bullseye/Dockerfile
index e1f2c4e3..cddb54dc 100644
--- a/5.042.000-main,threaded-bullseye/Dockerfile
+++ b/5.042.000-main,threaded-bullseye/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.042.000-main,threaded-trixie/Dockerfile b/5.042.000-main,threaded-trixie/Dockerfile
index 8b696d20..09e2baa0 100644
--- a/5.042.000-main,threaded-trixie/Dockerfile
+++ b/5.042.000-main,threaded-trixie/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.042.000-main-bookworm/Dockerfile b/5.042.000-main-bookworm/Dockerfile
index a889dc1a..bb0742b3 100644
--- a/5.042.000-main-bookworm/Dockerfile
+++ b/5.042.000-main-bookworm/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.042.000-main-bullseye/Dockerfile b/5.042.000-main-bullseye/Dockerfile
index b5e537be..8051674d 100644
--- a/5.042.000-main-bullseye/Dockerfile
+++ b/5.042.000-main-bullseye/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.042.000-main-trixie/Dockerfile b/5.042.000-main-trixie/Dockerfile
index 99f1ae76..1351d586 100644
--- a/5.042.000-main-trixie/Dockerfile
+++ b/5.042.000-main-trixie/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.042.000-slim,threaded-bookworm/Dockerfile b/5.042.000-slim,threaded-bookworm/Dockerfile
index 38516714..658992a1 100644
--- a/5.042.000-slim,threaded-bookworm/Dockerfile
+++ b/5.042.000-slim,threaded-bookworm/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.042.000-slim,threaded-bullseye/Dockerfile b/5.042.000-slim,threaded-bullseye/Dockerfile
index f6a06fed..93ef833c 100644
--- a/5.042.000-slim,threaded-bullseye/Dockerfile
+++ b/5.042.000-slim,threaded-bullseye/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.042.000-slim,threaded-trixie/Dockerfile b/5.042.000-slim,threaded-trixie/Dockerfile
index f2c934e0..5f6b43c4 100644
--- a/5.042.000-slim,threaded-trixie/Dockerfile
+++ b/5.042.000-slim,threaded-trixie/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.042.000-slim-bookworm/Dockerfile b/5.042.000-slim-bookworm/Dockerfile
index 5ba04bf1..6aa453c4 100644
--- a/5.042.000-slim-bookworm/Dockerfile
+++ b/5.042.000-slim-bookworm/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.042.000-slim-bullseye/Dockerfile b/5.042.000-slim-bullseye/Dockerfile
index dd077ead..fe4e8c9a 100644
--- a/5.042.000-slim-bullseye/Dockerfile
+++ b/5.042.000-slim-bullseye/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.042.000-slim-trixie/Dockerfile b/5.042.000-slim-trixie/Dockerfile
index a6411ad1..876da413 100644
--- a/5.042.000-slim-trixie/Dockerfile
+++ b/5.042.000-slim-trixie/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.043.002-main,threaded-bookworm/Dockerfile b/5.043.002-main,threaded-bookworm/Dockerfile
index f401503e..a208ac4c 100644
--- a/5.043.002-main,threaded-bookworm/Dockerfile
+++ b/5.043.002-main,threaded-bookworm/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Dusedevel -Dversiononly=undef -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.043.002-main,threaded-bullseye/Dockerfile b/5.043.002-main,threaded-bullseye/Dockerfile
index 6e2748ad..f99523f3 100644
--- a/5.043.002-main,threaded-bullseye/Dockerfile
+++ b/5.043.002-main,threaded-bullseye/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Dusedevel -Dversiononly=undef -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.043.002-main,threaded-trixie/Dockerfile b/5.043.002-main,threaded-trixie/Dockerfile
index 832d85aa..0fbe4794 100644
--- a/5.043.002-main,threaded-trixie/Dockerfile
+++ b/5.043.002-main,threaded-trixie/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Dusedevel -Dversiononly=undef -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.043.002-main-bookworm/Dockerfile b/5.043.002-main-bookworm/Dockerfile
index 4079d08b..aae29617 100644
--- a/5.043.002-main-bookworm/Dockerfile
+++ b/5.043.002-main-bookworm/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Dusedevel -Dversiononly=undef -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.043.002-main-bullseye/Dockerfile b/5.043.002-main-bullseye/Dockerfile
index 36ee0662..95f05de2 100644
--- a/5.043.002-main-bullseye/Dockerfile
+++ b/5.043.002-main-bullseye/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Dusedevel -Dversiononly=undef -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.043.002-main-trixie/Dockerfile b/5.043.002-main-trixie/Dockerfile
index 772d76fc..710e8b33 100644
--- a/5.043.002-main-trixie/Dockerfile
+++ b/5.043.002-main-trixie/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Dusedevel -Dversiononly=undef -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -22,7 +22,7 @@ RUN true \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.043.002-slim,threaded-bookworm/Dockerfile b/5.043.002-slim,threaded-bookworm/Dockerfile
index 03b17d1a..e97a1d1d 100644
--- a/5.043.002-slim,threaded-bookworm/Dockerfile
+++ b/5.043.002-slim,threaded-bookworm/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Dusedevel -Dversiononly=undef -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.043.002-slim,threaded-bullseye/Dockerfile b/5.043.002-slim,threaded-bullseye/Dockerfile
index 569ff9e3..c8aa8916 100644
--- a/5.043.002-slim,threaded-bullseye/Dockerfile
+++ b/5.043.002-slim,threaded-bullseye/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Dusedevel -Dversiononly=undef -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.043.002-slim,threaded-trixie/Dockerfile b/5.043.002-slim,threaded-trixie/Dockerfile
index 89f743fd..ee46ed7e 100644
--- a/5.043.002-slim,threaded-trixie/Dockerfile
+++ b/5.043.002-slim,threaded-trixie/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Dusedevel -Dversiononly=undef -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.043.002-slim-bookworm/Dockerfile b/5.043.002-slim-bookworm/Dockerfile
index b941a0f8..36841733 100644
--- a/5.043.002-slim-bookworm/Dockerfile
+++ b/5.043.002-slim-bookworm/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Dusedevel -Dversiononly=undef -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.043.002-slim-bullseye/Dockerfile b/5.043.002-slim-bullseye/Dockerfile
index 76e00f24..30a69989 100644
--- a/5.043.002-slim-bullseye/Dockerfile
+++ b/5.043.002-slim-bullseye/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Dusedevel -Dversiononly=undef -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/5.043.002-slim-trixie/Dockerfile b/5.043.002-slim-trixie/Dockerfile
index dc9cab04..eb6040f3 100644
--- a/5.043.002-slim-trixie/Dockerfile
+++ b/5.043.002-slim-trixie/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Dusedevel -Dversiononly=undef -des \
     && make -j$(nproc) \
-    && TEST_JOBS=$(nproc) make test_harness \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || TEST_JOBS=$(nproc) make test_harness; } \
     && make install \
     && cd /usr/src \
     && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz \
@@ -43,7 +43,7 @@ RUN apt-get update \
     && tar -xzf App-cpanminus-1.7047.tar.gz && cd App-cpanminus-1.7047 \
     && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' bin/cpanm \
     && perl -pi -E 's{try_lwp=>1}{try_lwp=>0}g' bin/cpanm \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO 'https://www.cpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.94.tar.gz' \
     && echo '9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d *Net-SSLeay-1.94.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD Net-SSLeay-1.94.tar.gz \
diff --git a/generate.pl b/generate.pl
index c30ce794..4f0e08f8 100755
--- a/generate.pl
+++ b/generate.pl
@@ -330,7 +330,7 @@ =head1 DESCRIPTION
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" {{args}} {{extra_flags}} -des \
     && make -j$(nproc) \
-    && {{test}} \
+    && { [ "$(dpkg --print-architecture)" = 'riscv64' ] || {{test}}; } \
     && make install \
     && cd /usr/src \
     && curl -fLO {{cpanm_dist_url}} \
@@ -338,7 +338,7 @@ =head1 DESCRIPTION
     && tar -xzf {{cpanm_dist_name}}.tar.gz && cd {{cpanm_dist_name}} \
     && {{cpanm_dist_patch_https}} \
     && {{cpanm_dist_patch_nolwp}} \
-    && perl bin/cpanm . && cd /root \
+    && perl bin/cpanm --notest . && cd /root \
     && curl -fLO '{{netssleay_dist_url}}' \
     && echo '{{netssleay_dist_sha256}} *{{netssleay_dist_name}}.tar.gz' | sha256sum --strict --check - \
     && cpanm --notest --from $PWD {{netssleay_dist_name}}.tar.gz \