diff --git a/script/rspec-slow-repeat b/script/rspec-slow-repeat
index 797ca46126..529e2e9489 100755
--- a/script/rspec-slow-repeat
+++ b/script/rspec-slow-repeat
@@ -7,6 +7,19 @@
 # You can use the resulting pass rate to asses if your code changes fixed it
 # or not. In the end I would run a spec 100 times to be sure it's stable.
 
+function finish() {
+  echo "Exiting..."
+  pkill -P $$
+  if [ "$pass_rate" -lt 100 ]; then
+    echo "Check tmp/rspec.log for details."
+    exit 1
+  else
+    exit 0
+  fi
+}
+
+trap finish SIGINT
+
 if [ "$#" -lt 1 ]; then
   echo "Usage:   $0 <n> [rspec params]"
   echo "Example: $0 30 spec/system/admin/order_cycles/simple_spec.rb:202"
@@ -15,8 +28,19 @@ fi
 
 n="$1"
 passed=0
-processors="`cat /proc/cpuinfo | grep -c processor`"
 
+# Check via uname the environment we are running in to get the number of cores
+if [[ "`uname`" == "Darwin" ]]; then
+  processors="`sysctl -n hw.ncpu.`"
+else
+  processors="`cat /proc/cpuinfo | grep -c processor`"
+fi
+
+echo "Running $n times with $processors cores"
+
+# The purpose here is to occupy the CPU (yes command is not multi-threaded and it occupies only one core)
+# Start one process for each core, and then simulating a very busy CI environment with a 100% CPU load
+# increasing the chance of race conditions when executing specs.
 for i in `seq $processors`; do
   yes > /dev/null &
 done
@@ -33,7 +57,7 @@ for i in `seq "$n"`; do
   fi
 done
 
-killall yes
-
 pass_rate="$(( passed * 100 / n))"
 echo "$passed of $n passed ($pass_rate%)"
+
+finish