diff --git a/lib/http_redirect_test/http_redirect_test.rb b/lib/http_redirect_test/http_redirect_test.rb
index 0c9c27b..2aa877e 100644
--- a/lib/http_redirect_test/http_redirect_test.rb
+++ b/lib/http_redirect_test/http_redirect_test.rb
@@ -6,22 +6,10 @@ class HTTPRedirectTest < MiniTest::Unit::TestCase
 
   def default_test; end # placeholder to stop Test::Unit from complaining
 
-  class <<self
+  module ClassMethods
     attr_accessor :domain
     attr_writer :permanent
 
-    def permanent?
-      !!@permanent
-    end
-
-    def name_for(path)
-      if path.empty?
-        'root'
-      else
-        path.strip.gsub(/\W+/, '_')
-      end
-    end
-
     def should_not_redirect(path)
       class_eval <<-CODE
         def test_#{name_for(path)}_should_not_redirect
@@ -80,6 +68,22 @@ def test_should_return_value_for_#{name_for(header)}_header
         end
       CODE
     end
+
+    private
+
+    def permanent?
+      !!@permanent
+    end
+
+    def name_for(path)
+      if path.empty?
+        'root'
+      else
+        path.strip.gsub(/\W+/, '_')
+      end
+    end
+
   end
 
+  extend ClassMethods
 end
diff --git a/test/unit/http_redirect_test_test.rb b/test/unit/http_redirect_test_test.rb
index 60d7431..55a6da5 100644
--- a/test/unit/http_redirect_test_test.rb
+++ b/test/unit/http_redirect_test_test.rb
@@ -2,9 +2,10 @@
 
 class HttpRedirectTestTests < MiniTest::Unit::TestCase
   def test_that_permanent_flag_is_being_set_correctly
-    assert_equal false,  HTTPRedirectTest.permanent?
+    assert_equal false,  HTTPRedirectTest.__send__(:permanent?)
+
     HTTPRedirectTest.permanent=true
-    assert_equal true,  HTTPRedirectTest.permanent?
+    assert_equal true,  HTTPRedirectTest.__send__(:permanent?)
   end
 
   def test_each_class_should_have_its_own_domain