diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 33144aa62f..0493544139 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1771,6 +1771,7 @@ class TestProcess < Test::Unit::TestCase
     min = 1_000 / (cmd.size + sep.size)
     cmds = Array.new(min, cmd)
     exs = [Errno::ENOENT]
+    exs << Errno::EINVAL if windows?
     exs << Errno::E2BIG if defined?(Errno::E2BIG)
     opts = {[STDOUT, STDERR]=>File::NULL}
     opts[:rlimit_nproc] = 128 if defined?(Process::RLIMIT_NPROC)
diff --git a/win32/resource.rb b/win32/resource.rb
index e19e04b922..bc3eda5630 100755
--- a/win32/resource.rb
+++ b/win32/resource.rb
@@ -61,6 +61,7 @@ end
 #include <winver.h>
 
 #{icon || ''}
+#{type == 'VFT_APP' ? "1 RT_MANIFEST ruby.manifest" : ""}
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION    #{nversion}
  PRODUCTVERSION #{nversion}
@@ -93,4 +94,3 @@ END
 EOF
   }
 end
-
diff --git a/win32/ruby.manifest b/win32/ruby.manifest
new file mode 100644
index 0000000000..2bd495979b
--- /dev/null
+++ b/win32/ruby.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+      <ws2:longPathAware>true</ws2:longPathAware>
+    </windowsSettings>
+  </application>
+</assembly>