diff --git a/master/custom/builders.py b/master/custom/builders.py
index b50a5cd6..9e067642 100644
--- a/master/custom/builders.py
+++ b/master/custom/builders.py
@@ -31,6 +31,7 @@
     SlowNonDebugUnixBuild,
     SlowNonDebugUnixBuild15BitDigits,
     SlowUnixInstalledBuild,
+    SlowClangUnixBuild,
     NonDebugUnixBuild,
     UnixInstalledBuild,
     LTONonDebugUnixBuild,
@@ -433,6 +434,7 @@ def generate_builderdefs(tags, tuples):
     # RISC-V 64-bit GCC
     ("RISC-V 64-bit Ubuntu", "rise-riscv64-4", SlowDebugUnixBuild),
     ("RISC-V 64-bit Ubuntu NoGIL", "rise-riscv64-3", SlowUnixNoGilBuild),
+    ("RISC-V 64-bit Ubuntu Clang", "rise-riscv64-2", SlowClangUnixBuild),
 ]))
 
 
diff --git a/master/custom/factories.py b/master/custom/factories.py
index 7c6329cf..9c91b63d 100644
--- a/master/custom/factories.py
+++ b/master/custom/factories.py
@@ -396,6 +396,11 @@ class SlowUnixInstalledBuild(UnixInstalledBuild):
     test_timeout = SLOW_TIMEOUT
 
 
+class SlowClangUnixBuild(ClangUnixBuild):
+    test_timeout = SLOW_TIMEOUT
+    testFlags = [*UnixBuild.testFlags, "-u-cpu"]
+
+
 class LTONonDebugUnixBuild(NonDebugUnixBuild):
     buildersuffix = ".lto"
     configureFlags = [
diff --git a/master/custom/workers.py b/master/custom/workers.py
index e864041d..fcc08dbb 100644
--- a/master/custom/workers.py
+++ b/master/custom/workers.py
@@ -229,6 +229,12 @@ def get_workers(settings):
                   'aarch32', 'arm'],
             parallel_tests=4,
         ),
+        cpw(
+            name="rise-riscv64-2",
+            tags=['linux', 'unix', 'ubuntu', 'riscv64'],
+            not_branches=['3.10'],
+            parallel_tests=4,
+        ),
         cpw(
             name="rise-riscv64-3",
             tags=['linux', 'unix', 'ubuntu', 'riscv64'],