diff --git a/tools/test.py b/tools/test.py
index 788d68734fe250..eb183c0b4e6a22 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -909,10 +909,11 @@ def GetTestStatus(self, context, sections, defs):
 
 
 TIMEOUT_SCALEFACTOR = {
-    'arm'   : { 'debug' :  8, 'release' : 3 }, # The ARM buildbots are slow.
-    'ia32'  : { 'debug' :  4, 'release' : 1 },
-    'ppc'   : { 'debug' :  4, 'release' : 1 },
-    's390'  : { 'debug' :  4, 'release' : 1 } }
+    'arm'       : { 'debug' :  8, 'release' : 3 }, # The ARM buildbots are slow.
+    'riscv64'   : { 'debug' :  8, 'release' : 3 }, # The riscv devices are slow.
+    'ia32'      : { 'debug' :  4, 'release' : 1 },
+    'ppc'       : { 'debug' :  4, 'release' : 1 },
+    's390'      : { 'debug' :  4, 'release' : 1 } }
 
 
 class Context(object):
diff --git a/tools/utils.py b/tools/utils.py
index d6dce5f7a52137..32a3b3dbcb824c 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -97,6 +97,8 @@ def GuessArchitecture():
     return 'ppc'
   elif id == 's390x':
     return 's390'
+  elif id == 'riscv64':
+    return 'riscv64'
   else:
     id = platform.processor()
     if id == 'powerpc':