diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index 1baaf889cb..6171c3a19e 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -1,6 +1,7 @@
 # -*- coding: us-ascii -*-
 # frozen_string_literal: false
 require 'test/unit'
+require "rbconfig/sizeof"
 
 class TestThread < Test::Unit::TestCase
   class Thread < ::Thread
@@ -227,6 +228,14 @@ class TestThread < Test::Unit::TestCase
     t3.kill if t3
   end
 
+  def test_join_limits
+    [ RbConfig::LIMITS['FIXNUM_MAX'], RbConfig::LIMITS['UINT64_MAX'],
+      Float::INFINITY ].each do |limit|
+      t = Thread.new {}
+      assert_same t, t.join(limit), "limit=#{limit.inspect}"
+    end
+  end
+
   def test_kill_main_thread
     assert_in_out_err([], <<-INPUT, %w(1), [])
       p 1
diff --git a/thread.c b/thread.c
index 0179a7ee9a..1f699f6bda 100644
--- a/thread.c
+++ b/thread.c
@@ -1040,7 +1040,6 @@ thread_join_m(int argc, VALUE *argv, VALUE self)
     switch (TYPE(limit)) {
       case T_NIL: break;
       case T_FIXNUM:
-      case T_BIGNUM:
         timeval.tv_sec = NUM2TIMET(limit);
         timeval.tv_usec = 0;
         tv = &timeval;