diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake
index 2c4e965e1fb..cb27a6c726c 100644
--- a/lib/tasks/qunit.rake
+++ b/lib/tasks/qunit.rake
@@ -47,7 +47,7 @@ task "qunit:test", [:timeout, :qunit_path] do |_, args|
     {
       "RAILS_ENV" => "test",
       "SKIP_ENFORCE_HOSTNAME" => "1",
-      "UNICORN_PID_PATH" => "#{Rails.root}/tmp/pids/unicorn_test.pid", # So this can run alongside development
+      "UNICORN_PID_PATH" => "#{Rails.root}/tmp/pids/unicorn_test_#{port}.pid", # So this can run alongside development
       "UNICORN_PORT" => port.to_s,
       "UNICORN_SIDEKIQS" => "0"
     },
@@ -89,7 +89,7 @@ task "qunit:test", [:timeout, :qunit_path] do |_, args|
     rescue Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL, Net::ReadTimeout
       sleep 1
       retry unless elapsed() > 60
-      puts "Timed out. Can no connect to forked server!"
+      puts "Timed out. Can not connect to forked server!"
       exit 1
     end
     puts "Rails server is warmed up"