diff --git a/test/rb/Gemfile b/test/rb/Gemfile
new file mode 100644
index 0000000..8301e44
--- /dev/null
+++ b/test/rb/Gemfile
@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+require "rubygems"
+
+gem "rack", "~> 1.5.2"
+gem "thin", "~> 1.5.0"
diff --git a/test/rb/Makefile.am b/test/rb/Makefile.am
index 58b11f2..9cdd99b 100644
--- a/test/rb/Makefile.am
+++ b/test/rb/Makefile.am
@@ -24,5 +24,8 @@
 	$(THRIFT) --gen rb ../SmallTest.thrift
 
 check: stubs
-	$(RUBY) -I. test_suite.rb
+if HAVE_BUNDLER
+	$(BUNDLER) install
+	$(BUNDLER) exec $(RUBY) -I. test_suite.rb
+endif