diff --git a/test/rb/integration/accelerated_buffered_client.rb b/test/rb/integration/accelerated_buffered_client.rb
old mode 100644
new mode 100755
index 7cec1df..f2403c5
--- a/test/rb/integration/accelerated_buffered_client.rb
+++ b/test/rb/integration/accelerated_buffered_client.rb
@@ -17,10 +17,11 @@
 # under the License.
 #
 
-require File.join(File.dirname(__FILE__), '../test_helper')
+$:.push File.dirname(__FILE__) + '/..'
 
+require 'test_helper'
 require 'thrift'
-require 'ThriftTest'
+require 'thrift_test'
 
 class AcceleratedBufferedClientTest < Test::Unit::TestCase
   def setup
diff --git a/test/rb/integration/accelerated_buffered_server.rb b/test/rb/integration/accelerated_buffered_server.rb
old mode 100644
new mode 100755
index 1ca66e5..af5e601
--- a/test/rb/integration/accelerated_buffered_server.rb
+++ b/test/rb/integration/accelerated_buffered_server.rb
@@ -17,12 +17,11 @@
 # under the License.
 #
 
-$:.push File.dirname(__FILE__) + '/../gen-rb'
-$:.push File.join(File.dirname(__FILE__), '../../../lib/rb/lib')
-$:.push File.join(File.dirname(__FILE__), '../../../lib/rb/ext')
+$:.push File.dirname(__FILE__) + '/..'
 
+require 'test_helper'
 require 'thrift'
-require 'ThriftTest'
+require 'thrift_test'
 
 class SimpleHandler
   [:testString, :testByte, :testI32, :testI64, :testDouble,
diff --git a/test/rb/integration/buffered_client.rb b/test/rb/integration/buffered_client.rb
old mode 100644
new mode 100755
index 1a925cc..16f6d4e
--- a/test/rb/integration/buffered_client.rb
+++ b/test/rb/integration/buffered_client.rb
@@ -17,10 +17,11 @@
 # under the License.
 #
 
-require File.join(File.dirname(__FILE__), '../test_helper')
+$:.push File.dirname(__FILE__) + '/..'
 
+require 'test_helper'
 require 'thrift'
-require 'ThriftTest'
+require 'thrift_test'
 
 class BufferedClientTest < Test::Unit::TestCase
   def setup
diff --git a/test/rb/integration/simple_client.rb b/test/rb/integration/simple_client.rb
old mode 100644
new mode 100755
index 1064822..f7516fc
--- a/test/rb/integration/simple_client.rb
+++ b/test/rb/integration/simple_client.rb
@@ -17,10 +17,11 @@
 # under the License.
 #
 
-require File.join(File.dirname(__FILE__), '../test_helper')
+$:.push File.dirname(__FILE__) + '/..'
 
+require 'test_helper'
 require 'thrift'
-require 'ThriftTest'
+require 'thrift_test'
 
 class SimpleClientTest < Test::Unit::TestCase
   def setup    
diff --git a/test/rb/integration/simple_server.rb b/test/rb/integration/simple_server.rb
old mode 100644
new mode 100755
index 3518d2e..e543b70
--- a/test/rb/integration/simple_server.rb
+++ b/test/rb/integration/simple_server.rb
@@ -17,11 +17,11 @@
 # under the License.
 #
 
-$:.push File.dirname(__FILE__) + '/../gen-rb'
-$:.push File.join(File.dirname(__FILE__), '../../../lib/rb/lib')
+$:.push File.dirname(__FILE__) + '/..'
 
+require 'test_helper'
 require 'thrift'
-require 'ThriftTest'
+require 'thrift_test'
 
 class SimpleHandler
   [:testString, :testByte, :testI32, :testI64, :testDouble,
diff --git a/test/rb/integration/test_simple_handler.rb b/test/rb/integration/test_simple_handler.rb
old mode 100644
new mode 100755
index c34aa7e..c056139
--- a/test/rb/integration/test_simple_handler.rb
+++ b/test/rb/integration/test_simple_handler.rb
@@ -17,10 +17,11 @@
 # under the License.
 #
 
-require File.join(File.dirname(__FILE__), '../test_helper')
+$:.push File.dirname(__FILE__) + '/..'
 
+require 'test_helper'
 require 'thrift'
-require 'ThriftTest'
+require 'thrift_test'
 
 class TestHandler
   [:testString, :testByte, :testI32, :testI64, :testDouble,
diff --git a/test/test.sh b/test/test.sh
index bec3d22..e3fc46d 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -233,5 +233,12 @@
         "cpp/TestClient --transport=framed" \
         "make -C nodejs/ server" \
         "1" "5"
-
+do_test "rb-rb" "binary" "buffered-ip" \
+        "ruby rb/integration/simple_client.rb" \
+        "ruby rb/integration/simple_server.rb" \
+        "1" "5"
+do_test "rb-rb" "binary-accel" "buffered-ip" \
+        "ruby rb/integration/accelerated_buffered_client.rb" \
+        "ruby rb/integration/accelerated_buffered_server.rb" \
+        "1" "5"
 cd -