diff --git a/.gitignore b/.gitignore
index c6d2f07..28fad19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@ test/load/thin/config.yml
 test/tools/data/
 .rvmrc
 Gemfile.lock
+.idea/*
+
diff --git a/Gemfile b/Gemfile
index 547c402..9bb321e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ group :development, :test do
   gem "bundler"
   gem "rake"
   gem "json"
-  gem "bson_ext"
+  gem "bson_ext" unless RUBY_PLATFORM == "java"
 
   # Deployment
   gem "git"
@@ -15,7 +15,7 @@ group :development, :test do
   gem "shoulda"
   gem "test-unit"
   gem "ci_reporter"
-  gem "ruby-prof"
+  gem "ruby-prof" unless RUBY_PLATFORM == "java"
 
   # Java
   platforms :jruby do
diff --git a/test/auxillary/1.4_features.rb b/test/auxillary/1.4_features.rb
index a248721..d46f698 100644
--- a/test/auxillary/1.4_features.rb
+++ b/test/auxillary/1.4_features.rb
@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 # Demonstrate features in MongoDB 1.4
 class Features14Test < Test::Unit::TestCase
diff --git a/test/auxillary/authentication_test.rb b/test/auxillary/authentication_test.rb
index a744d1e..e5db70d 100644
--- a/test/auxillary/authentication_test.rb
+++ b/test/auxillary/authentication_test.rb
@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 # NOTE: This test requires bouncing the server.
 # It also requires that a user exists on the admin database.
diff --git a/test/auxillary/autoreconnect_test.rb b/test/auxillary/autoreconnect_test.rb
index 026f498..34c80cc 100644
--- a/test/auxillary/autoreconnect_test.rb
+++ b/test/auxillary/autoreconnect_test.rb
@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 # NOTE: This test requires bouncing the server
 class AutoreconnectTest < Test::Unit::TestCase
diff --git a/test/auxillary/fork_test.rb b/test/auxillary/fork_test.rb
index 062e870..d726c59 100644
--- a/test/auxillary/fork_test.rb
+++ b/test/auxillary/fork_test.rb
@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class ForkTest < Test::Unit::TestCase
   include Mongo
diff --git a/test/auxillary/repl_set_auth_test.rb b/test/auxillary/repl_set_auth_test.rb
index 8f6e630..5cb8eeb 100644
--- a/test/auxillary/repl_set_auth_test.rb
+++ b/test/auxillary/repl_set_auth_test.rb
@@ -1,5 +1,5 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 require './test/tools/auth_repl_set_manager'
 require './test/replica_sets/rs_test_helper'
 
diff --git a/test/auxillary/slave_connection_test.rb b/test/auxillary/slave_connection_test.rb
index 6b06f1a..d200031 100644
--- a/test/auxillary/slave_connection_test.rb
+++ b/test/auxillary/slave_connection_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 # NOTE: these tests are run only if we can connect to a single MongoDB in slave mode.
 class SlaveConnectionTest < Test::Unit::TestCase
diff --git a/test/auxillary/threaded_authentication_test.rb b/test/auxillary/threaded_authentication_test.rb
index d60200a..11ae611 100644
--- a/test/auxillary/threaded_authentication_test.rb
+++ b/test/auxillary/threaded_authentication_test.rb
@@ -2,7 +2,7 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'thread'
 require 'test/unit'
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 # NOTE: This test requires bouncing the server.
 # It also requires that a user exists on the admin database.
diff --git a/test/bson/binary_test.rb b/test/bson/binary_test.rb
index 666e7c3..cecda84 100644
--- a/test/bson/binary_test.rb
+++ b/test/bson/binary_test.rb
@@ -1,5 +1,5 @@
 # encoding:utf-8
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class BinaryTest < Test::Unit::TestCase
   def setup
diff --git a/test/bson/bson_test.rb b/test/bson/bson_test.rb
index cff2256..61e703e 100644
--- a/test/bson/bson_test.rb
+++ b/test/bson/bson_test.rb
@@ -1,5 +1,5 @@
 # encoding:utf-8
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'set'
 
 if RUBY_VERSION < '1.9'
diff --git a/test/bson/byte_buffer_test.rb b/test/bson/byte_buffer_test.rb
index a599c7b..c2fc547 100644
--- a/test/bson/byte_buffer_test.rb
+++ b/test/bson/byte_buffer_test.rb
@@ -1,5 +1,5 @@
 # encoding: binary
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class ByteBufferTest < Test::Unit::TestCase
   include BSON
diff --git a/test/bson/hash_with_indifferent_access_test.rb b/test/bson/hash_with_indifferent_access_test.rb
index 0574ebb..72c0bf4 100644
--- a/test/bson/hash_with_indifferent_access_test.rb
+++ b/test/bson/hash_with_indifferent_access_test.rb
@@ -1,5 +1,5 @@
 # encoding:utf-8
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require './test/support/hash_with_indifferent_access'
 
 class HashWithIndifferentAccessTest < Test::Unit::TestCase
diff --git a/test/bson/json_test.rb b/test/bson/json_test.rb
index a29adbb..acb31af 100644
--- a/test/bson/json_test.rb
+++ b/test/bson/json_test.rb
@@ -1,4 +1,4 @@
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'rubygems'
 require 'json'
 
diff --git a/test/bson/object_id_test.rb b/test/bson/object_id_test.rb
index 42bf7b9..837133e 100644
--- a/test/bson/object_id_test.rb
+++ b/test/bson/object_id_test.rb
@@ -1,4 +1,4 @@
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'rubygems'
 require 'json'
 
diff --git a/test/bson/ordered_hash_test.rb b/test/bson/ordered_hash_test.rb
index ac804cf..61587cd 100644
--- a/test/bson/ordered_hash_test.rb
+++ b/test/bson/ordered_hash_test.rb
@@ -1,4 +1,4 @@
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class OrderedHashTest < Test::Unit::TestCase
 
diff --git a/test/bson/timestamp_test.rb b/test/bson/timestamp_test.rb
index b023f77..6d37645 100644
--- a/test/bson/timestamp_test.rb
+++ b/test/bson/timestamp_test.rb
@@ -1,4 +1,4 @@
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class TimestampTest < Test::Unit::TestCase
 
diff --git a/test/collection_test.rb b/test/collection_test.rb
index 528cdb1..b9db019 100644
--- a/test/collection_test.rb
+++ b/test/collection_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'rbconfig'
 
 class TestCollection < Test::Unit::TestCase
diff --git a/test/connection_test.rb b/test/connection_test.rb
index 819deb8..6e9ab7a 100644
--- a/test/connection_test.rb
+++ b/test/connection_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'logger'
 require 'stringio'
 require 'thread'
diff --git a/test/conversions_test.rb b/test/conversions_test.rb
index 91856fa..6b018e5 100644
--- a/test/conversions_test.rb
+++ b/test/conversions_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'mongo/exceptions'
 require 'mongo/util/conversions'
 
diff --git a/test/cursor_fail_test.rb b/test/cursor_fail_test.rb
index c5e65fc..158fd0f 100644
--- a/test/cursor_fail_test.rb
+++ b/test/cursor_fail_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'logger'
 
 class CursorFailTest < Test::Unit::TestCase
diff --git a/test/cursor_message_test.rb b/test/cursor_message_test.rb
index 17b82df..77d497e 100644
--- a/test/cursor_message_test.rb
+++ b/test/cursor_message_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'logger'
 
 class CursorMessageTest < Test::Unit::TestCase
diff --git a/test/cursor_test.rb b/test/cursor_test.rb
index ed35cd0..1554d9a 100644
--- a/test/cursor_test.rb
+++ b/test/cursor_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'logger'
 
 class CursorTest < Test::Unit::TestCase
diff --git a/test/db_api_test.rb b/test/db_api_test.rb
index da48803..f31b9de 100644
--- a/test/db_api_test.rb
+++ b/test/db_api_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class DBAPITest < Test::Unit::TestCase
   include Mongo
diff --git a/test/db_connection_test.rb b/test/db_connection_test.rb
index 3221ab3..970f5b5 100644
--- a/test/db_connection_test.rb
+++ b/test/db_connection_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class DBConnectionTest < Test::Unit::TestCase
 
diff --git a/test/db_test.rb b/test/db_test.rb
index c14dd39..bbae650 100644
--- a/test/db_test.rb
+++ b/test/db_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'digest/md5'
 require 'stringio'
 require 'logger'
diff --git a/test/grid_file_system_test.rb b/test/grid_file_system_test.rb
index a4d19c0..4c57115 100644
--- a/test/grid_file_system_test.rb
+++ b/test/grid_file_system_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class GridFileSystemTest < Test::Unit::TestCase
   context "GridFileSystem:" do
diff --git a/test/grid_io_test.rb b/test/grid_io_test.rb
index 45ae590..cee9fad 100644
--- a/test/grid_io_test.rb
+++ b/test/grid_io_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class GridIOTest < Test::Unit::TestCase
 
diff --git a/test/grid_test.rb b/test/grid_test.rb
index 4ee1470..e901952 100644
--- a/test/grid_test.rb
+++ b/test/grid_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 include Mongo
 
 def read_and_write_stream(filename, read_length, opts={})
diff --git a/test/pool_test.rb b/test/pool_test.rb
index a62f69e..86b5f67 100644
--- a/test/pool_test.rb
+++ b/test/pool_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'thread'
 
 class PoolTest < Test::Unit::TestCase
diff --git a/test/replica_sets/rs_test_helper.rb b/test/replica_sets/rs_test_helper.rb
index c1ec2ac..fb40f1c 100644
--- a/test/replica_sets/rs_test_helper.rb
+++ b/test/replica_sets/rs_test_helper.rb
@@ -1,5 +1,5 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 require './test/tools/repl_set_manager'
 
 class Test::Unit::TestCase
diff --git a/test/safe_test.rb b/test/safe_test.rb
index 2a3d89e..5e73753 100644
--- a/test/safe_test.rb
+++ b/test/safe_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 include Mongo
 
 class SafeTest < Test::Unit::TestCase
diff --git a/test/support_test.rb b/test/support_test.rb
index 50d367d..6cf9876 100644
--- a/test/support_test.rb
+++ b/test/support_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class SupportTest < Test::Unit::TestCase
 
diff --git a/test/threading/threading_with_large_pool_test.rb b/test/threading/threading_with_large_pool_test.rb
index 256083c..32ed17c 100644
--- a/test/threading/threading_with_large_pool_test.rb
+++ b/test/threading/threading_with_large_pool_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 # Essentialy the same as test_threading.rb but with an expanded pool for
 # testing multiple connections.
diff --git a/test/threading_test.rb b/test/threading_test.rb
index c4f6d50..0c7671b 100644
--- a/test/threading_test.rb
+++ b/test/threading_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class TestThreading < Test::Unit::TestCase
 
diff --git a/test/timeout_test.rb b/test/timeout_test.rb
index dc90876..354e94b 100644
--- a/test/timeout_test.rb
+++ b/test/timeout_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class TestTimeout < Test::Unit::TestCase
   def test_op_timeout
diff --git a/test/unit/collection_test.rb b/test/unit/collection_test.rb
index 1fc796e..095b902 100644
--- a/test/unit/collection_test.rb
+++ b/test/unit/collection_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class CollectionTest < Test::Unit::TestCase
 
diff --git a/test/unit/connection_test.rb b/test/unit/connection_test.rb
index 3ff35c1..a4ab0d3 100644
--- a/test/unit/connection_test.rb
+++ b/test/unit/connection_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 include Mongo
 
 class ConnectionTest < Test::Unit::TestCase
diff --git a/test/unit/cursor_test.rb b/test/unit/cursor_test.rb
index f7eac6f..c0f18da 100644
--- a/test/unit/cursor_test.rb
+++ b/test/unit/cursor_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class CursorTest < Test::Unit::TestCase
   context "Cursor options" do
diff --git a/test/unit/db_test.rb b/test/unit/db_test.rb
index e8d2926..286872b 100644
--- a/test/unit/db_test.rb
+++ b/test/unit/db_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 def insert_message(db, documents)
   documents = [documents] unless documents.is_a?(Array)
diff --git a/test/unit/grid_test.rb b/test/unit/grid_test.rb
index f3cf3b4..cb3a73e 100644
--- a/test/unit/grid_test.rb
+++ b/test/unit/grid_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class GridTest < Test::Unit::TestCase
 
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index 931396e..7eb7b64 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class NodeTest < Test::Unit::TestCase
 
diff --git a/test/unit/pool_manager_test.rb b/test/unit/pool_manager_test.rb
index 3673925..bb3a4bb 100644
--- a/test/unit/pool_manager_test.rb
+++ b/test/unit/pool_manager_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 include Mongo
 
 class PoolManagerTest < Test::Unit::TestCase
diff --git a/test/unit/pool_test.rb b/test/unit/pool_test.rb
index b45bb2d..51190a9 100644
--- a/test/unit/pool_test.rb
+++ b/test/unit/pool_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 include Mongo
 
 class PoolTest < Test::Unit::TestCase
diff --git a/test/unit/read_test.rb b/test/unit/read_test.rb
index 5322186..75d992d 100644
--- a/test/unit/read_test.rb
+++ b/test/unit/read_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class ReadTest < Test::Unit::TestCase
 
diff --git a/test/unit/safe_test.rb b/test/unit/safe_test.rb
index bf9f9f9..a129a2f 100644
--- a/test/unit/safe_test.rb
+++ b/test/unit/safe_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class SafeTest < Test::Unit::TestCase
 
diff --git a/test/uri_test.rb b/test/uri_test.rb
index fc2008d..e833cfb 100644
--- a/test/uri_test.rb
+++ b/test/uri_test.rb
@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class URITest < Test::Unit::TestCase
   include Mongo