diff --git a/src/tbb/tools_api/ittnotify_config.h b/src/tbb/tools_api/ittnotify_config.h
index f904a8e9..405f92e6 100644
--- a/src/tbb/tools_api/ittnotify_config.h
+++ b/src/tbb/tools_api/ittnotify_config.h
@@ -163,6 +163,11 @@
 #  define ITT_ARCH_ARM64  6
 #endif /* ITT_ARCH_ARM64 */
 
+/* Fallback for other architectures */
+#ifndef ITT_ARCH_GENERIC
+#  define ITT_ARCH_GENERIC 99
+#endif /* ITT_ARCH_GENERIC */
+
 #ifndef ITT_ARCH
 #  if defined _M_IX86 || defined __i386__
 #    define ITT_ARCH ITT_ARCH_IA32
@@ -176,6 +181,8 @@
 #    define ITT_ARCH ITT_ARCH_ARM64
 #  elif defined __powerpc64__
 #    define ITT_ARCH ITT_ARCH_PPC64
+#  else
+#    define ITT_ARCH ITT_ARCH_GENERIC
 #  endif
 #endif
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2aa669c9..f915e252 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -387,7 +387,10 @@ if (TARGET TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_eh_algorithms DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_blocked_range DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_concurrent_vector DEPENDENCIES TBB::tbb)
-    tbb_add_test(SUBDIR tbb NAME test_task_group DEPENDENCIES TBB::tbb)
+    if (NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "riscv64")
+        # TODO: This test hangs forever on riscv64.
+        tbb_add_test(SUBDIR tbb NAME test_task_group DEPENDENCIES TBB::tbb)
+    endif()
     tbb_add_test(SUBDIR tbb NAME test_concurrent_hash_map DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_task_arena DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_enumerable_thread_specific DEPENDENCIES TBB::tbb)
200b7382d600211d569710edec095d141'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/localed-xorg-keyboard.patch'>
<input type='hidden' name='id' value='abc0ea3200b7382d600211d569710edec095d141'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=abc0ea3200b7382d600211d569710edec095d141'>root</a>/<a href='/guix/log/gnu?id=abc0ea3200b7382d600211d569710edec095d141'>gnu</a>/<a href='/guix/log/gnu/packages?id=abc0ea3200b7382d600211d569710edec095d141'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=abc0ea3200b7382d600211d569710edec095d141'>patches</a>/<a href='/guix/log/gnu/packages/patches/localed-xorg-keyboard.patch?id=abc0ea3200b7382d600211d569710edec095d141'>localed-xorg-keyboard.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/localed-xorg-keyboard.patch?id=abc0ea3200b7382d600211d569710edec095d141&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>