diff --git a/lib/stats_d.rb b/lib/stats_d.rb
index 2e041db3..3be0763d 100644
--- a/lib/stats_d.rb
+++ b/lib/stats_d.rb
@@ -1,7 +1,9 @@
 require 'socket'
 
 module StatsD
-  mattr_accessor :host, :port, :mode, :logger, :enabled
+  class << self
+    attr_accessor :host, :port, :mode, :logger, :enabled
+  end
   self.enabled = true
 
   trap("TTOU") { self.enabled = false }
diff --git a/test/stats_d_test.rb b/test/stats_d_test.rb
index 05804301..72cd6665 100644
--- a/test/stats_d_test.rb
+++ b/test/stats_d_test.rb
@@ -1,8 +1,7 @@
-require 'active_support/all'
-$LOAD_PATH << File.dirname(__FILE__) + '/../lib'
 require 'stats_d'
 require 'test/unit'
 require 'mocha'
+require 'logger'
 
 StatsD.logger = Logger.new('/dev/null')
 
@@ -110,7 +109,7 @@ def test_count_with_successful_sample
     StatsD.unstub(:increment)
     StatsD.stubs(:rand).returns(0.01)
     StatsD.logger.expects(:info).once.with do |string|
-      string.ends_with?('@0.1')
+      string.include?('@0.1')
     end
 
     StatsD.increment('sampling.foo.bar', 1, 0.1)