2 files changed, 13 insertions, 3 deletions
diff --git a/test/bintest.rb b/test/bintest.rb
index e6d122047..0ef0b4187 100644
--- a/test/bintest.rb
+++ b/test/bintest.rb
@@ -2,11 +2,21 @@ $:.unshift File.dirname(File.dirname(File.expand_path(__FILE__)))
 require 'test/assert.rb'
 
 def cmd(s)
-  ENV['SHELL'] ? "bin/#{s}" : "bin\\#{s}.exe"
+  case RbConfig::CONFIG['host_os']
+  when /mswin(?!ce)|mingw|cygwin|bccwin/
+    "bin\\#{s}.exe"
+  else
+    "bin/#{s}"
+  end
 end
 
 def shellquote(s)
-  ENV['SHELL'] ? "'#{s}'" : "\"#{s}\""
+  case RbConfig::CONFIG['host_os']
+  when /mswin(?!ce)|mingw|cygwin|bccwin/
+    "\"#{s}\""
+  else
+    "'#{s}'"
+  end
 end
 
 ARGV.each do |gem|
diff --git a/test/t/float.rb b/test/t/float.rb
index 0aab0b1f2..1805c6e7d 100644
--- a/test/t/float.rb
+++ b/test/t/float.rb
@@ -198,5 +198,5 @@ assert('Float#>>') do
   assert_equal 0, 23.0 >> 128
 
   # Don't raise on large Right Shift
-  assert_equal -1, -23.0 >> 128
+  assert_equal(-1, -23.0 >> 128)
 end