diff --git a/test/rb/benchmarks/protocol_benchmark.rb b/test/rb/benchmarks/protocol_benchmark.rb
index b9fde17..05a8ee5 100644
--- a/test/rb/benchmarks/protocol_benchmark.rb
+++ b/test/rb/benchmarks/protocol_benchmark.rb
@@ -21,9 +21,6 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. .. .. lib rb ext])
 
 require 'thrift'
-require 'thrift/transport'
-require 'thrift/protocol/binaryprotocol'
-require 'thrift/protocol/binaryprotocolaccelerated'
 
 require 'benchmark'
 require 'rubygems'
diff --git a/test/rb/core/test_backwards_compatability.rb b/test/rb/core/test_backwards_compatability.rb
index 692aaf1..0577515 100644
--- a/test/rb/core/test_backwards_compatability.rb
+++ b/test/rb/core/test_backwards_compatability.rb
@@ -26,6 +26,5 @@
     msg = "hi there thrift"
     assert_equal msg, Thrift::Exception.new(msg).message
   end
-  
 end
 
diff --git a/test/rb/core/transport/test_transport.rb b/test/rb/core/transport/test_transport.rb
index eb6e03d..52755c1 100644
--- a/test/rb/core/transport/test_transport.rb
+++ b/test/rb/core/transport/test_transport.rb
@@ -19,9 +19,9 @@
 
 require File.join(File.dirname(__FILE__), '../../test_helper')
 
-require 'thrift/transport'
+require 'thrift'
 
-class DummyTransport < Thrift::Transport
+class DummyTransport < Thrift::BaseTransport
   def initialize(data)
     @data = data
   end
@@ -34,7 +34,7 @@
 # TTransport is basically an abstract class, but isn't raising NotImplementedError
 class TestThriftTransport < Test::Unit::TestCase
   def setup
-    @trans = Thrift::Transport.new
+    @trans = Thrift::BaseTransport.new
   end
   
   def test_open?
diff --git a/test/rb/integration/accelerated_buffered_client.rb b/test/rb/integration/accelerated_buffered_client.rb
index 5a66cb8..7cec1df 100644
--- a/test/rb/integration/accelerated_buffered_client.rb
+++ b/test/rb/integration/accelerated_buffered_client.rb
@@ -20,7 +20,6 @@
 require File.join(File.dirname(__FILE__), '../test_helper')
 
 require 'thrift'
-require 'thrift/protocol/binaryprotocolaccelerated'
 require 'ThriftTest'
 
 class AcceleratedBufferedClientTest < Test::Unit::TestCase
diff --git a/test/rb/integration/accelerated_buffered_server.rb b/test/rb/integration/accelerated_buffered_server.rb
index 11e09df..1ca66e5 100644
--- a/test/rb/integration/accelerated_buffered_server.rb
+++ b/test/rb/integration/accelerated_buffered_server.rb
@@ -22,7 +22,6 @@
 $:.push File.join(File.dirname(__FILE__), '../../../lib/rb/ext')
 
 require 'thrift'
-require 'thrift/protocol/binaryprotocolaccelerated'
 require 'ThriftTest'
 
 class SimpleHandler
diff --git a/test/rb/integration/buffered_client.rb b/test/rb/integration/buffered_client.rb
index 50dac30..1a925cc 100644
--- a/test/rb/integration/buffered_client.rb
+++ b/test/rb/integration/buffered_client.rb
@@ -20,7 +20,6 @@
 require File.join(File.dirname(__FILE__), '../test_helper')
 
 require 'thrift'
-require 'thrift/protocol/binaryprotocol'
 require 'ThriftTest'
 
 class BufferedClientTest < Test::Unit::TestCase
diff --git a/test/rb/integration/simple_client.rb b/test/rb/integration/simple_client.rb
index 591cd45..1064822 100644
--- a/test/rb/integration/simple_client.rb
+++ b/test/rb/integration/simple_client.rb
@@ -20,7 +20,6 @@
 require File.join(File.dirname(__FILE__), '../test_helper')
 
 require 'thrift'
-require 'thrift/protocol/binaryprotocol'
 require 'ThriftTest'
 
 class SimpleClientTest < Test::Unit::TestCase
diff --git a/test/rb/integration/simple_server.rb b/test/rb/integration/simple_server.rb
index 450704b..3518d2e 100644
--- a/test/rb/integration/simple_server.rb
+++ b/test/rb/integration/simple_server.rb
@@ -21,7 +21,6 @@
 $:.push File.join(File.dirname(__FILE__), '../../../lib/rb/lib')
 
 require 'thrift'
-require 'thrift/protocol/binaryprotocol'
 require 'ThriftTest'
 
 class SimpleHandler
diff --git a/test/rb/integration/test_simple_handler.rb b/test/rb/integration/test_simple_handler.rb
index 3894576..c34aa7e 100644
--- a/test/rb/integration/test_simple_handler.rb
+++ b/test/rb/integration/test_simple_handler.rb
@@ -20,7 +20,6 @@
 require File.join(File.dirname(__FILE__), '../test_helper')
 
 require 'thrift'
-require 'thrift/protocol/binaryprotocol'
 require 'ThriftTest'
 
 class TestHandler
diff --git a/tutorial/rb/RubyClient.rb b/tutorial/rb/RubyClient.rb
index 623fde0..8971fed 100755
--- a/tutorial/rb/RubyClient.rb
+++ b/tutorial/rb/RubyClient.rb
@@ -23,7 +23,6 @@
 $:.unshift '../../lib/rb/lib'
 
 require 'thrift'
-require 'thrift/protocol/binaryprotocol'
 
 require 'Calculator'
 
diff --git a/tutorial/rb/RubyServer.rb b/tutorial/rb/RubyServer.rb
index 4f8e486..89eb373 100755
--- a/tutorial/rb/RubyServer.rb
+++ b/tutorial/rb/RubyServer.rb
@@ -23,8 +23,6 @@
 $:.unshift '../../lib/rb/lib'
 
 require 'thrift'
-require 'thrift/protocol/binaryprotocol'
-require 'thrift/server/tserver'
 
 require 'Calculator'
 require 'shared_types'