diff --git a/test/functional/buildAndPackage/src/net/adoptium/test/FeatureTests.java b/test/functional/buildAndPackage/src/net/adoptium/test/FeatureTests.java
index d6a0ede25..4360b6882 100644
--- a/test/functional/buildAndPackage/src/net/adoptium/test/FeatureTests.java
+++ b/test/functional/buildAndPackage/src/net/adoptium/test/FeatureTests.java
@@ -74,6 +74,11 @@ public void testShenandoahAvailable() {
         if (jdkVersion.isNewerOrEqual(17) && jdkPlatform.runsOn(OperatingSystem.LINUX, Architecture.PPC64LE)) {
         	shouldBePresent = true;
         }
+        if (jdkVersion.isNewerOrEqual(19) || jdkVersion.isNewerOrEqualSameFeature(17, 0, 9)) {
+            if (jdkPlatform.runsOn(OperatingSystem.LINUX, Architecture.RISCV64)) {
+                shouldBePresent = true;
+            }
+        }
 
         LOGGER.info(String.format("Detected %s on %s, expect Shenandoah to be present: %s",
                 jdkVersion, jdkPlatform, shouldBePresent));
@@ -130,6 +135,11 @@ public void testZGCAvailable() {
                 shouldBePresent = true;
             }
         }
+        if (jdkVersion.isNewerOrEqual(19) || jdkVersion.isNewerOrEqualSameFeature(17, 0, 9)) {
+            if (jdkPlatform.runsOn(OperatingSystem.LINUX, Architecture.RISCV64)) {
+                shouldBePresent = true;
+            }
+        }
 
         LOGGER.info(String.format("Detected %s on %s, expect ZGC to be present: %s",
                 jdkVersion, jdkPlatform, shouldBePresent));