diff --git a/Modules/NProc.cmake b/Modules/NProc.cmake
index 26c90efe0..8bf32022d 100644
--- a/Modules/NProc.cmake
+++ b/Modules/NProc.cmake
@@ -1,6 +1,8 @@
+# This CMake module returns the result of 'nproc' (or its equivalent on Apple).
+# The newline is trimmed from the result using the `tr -d '\n'` command.
+
 if(APPLE)
-  execute_process(COMMAND sysctl -n hw.logicalcpu OUTPUT_VARIABLE NPROC)
-elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  # When CMake 3.25 is mandated, we can use elseif(LINUX)
-  execute_process(COMMAND nproc OUTPUT_VARIABLE NPROC)
+  execute_process(COMMAND sysctl -n hw.logicalcpu COMMAND tr -d '\n' OUTPUT_VARIABLE NPROC)
+elseif(LINUX)
+  execute_process(COMMAND nproc COMMAND tr -d '\n' OUTPUT_VARIABLE NPROC)
 endif()
diff --git a/test/max-parallelism/check_parallelism_default.jsonnet.in b/test/max-parallelism/check_parallelism_default.jsonnet.in
index f77c7eda7..4924cafea 100644
--- a/test/max-parallelism/check_parallelism_default.jsonnet.in
+++ b/test/max-parallelism/check_parallelism_default.jsonnet.in
@@ -10,7 +10,7 @@
   modules: {
     verify: {
       cpp: 'check_parallelism',
-      expected_parallelism: '@NPROC@',
+      expected_parallelism: @NPROC@,
     },
   },
 }