diff --git a/test/test_association.rb b/test/test_association.rb
index dc9142b7..0721fee6 100644
--- a/test/test_association.rb
+++ b/test/test_association.rb
@@ -1,5 +1,6 @@
 require "minitest/autorun"
 require "openid/association"
+require "openid/protocolerror"
 
 module OpenID
   class AssociationTestCase < Minitest::Test
diff --git a/test/test_associationmanager.rb b/test/test_associationmanager.rb
index 8a2eaf24..47c22645 100644
--- a/test/test_associationmanager.rb
+++ b/test/test_associationmanager.rb
@@ -1,10 +1,12 @@
 require "minitest/autorun"
+require "testutil"
 require "openid/consumer/associationmanager"
 require "openid/association"
 require "openid/dh"
 require "openid/util"
 require "openid/cryptutil"
 require "openid/message"
+require "openid/protocolerror"
 require "openid/store/memory"
 require "util"
 require "time"
diff --git a/test/test_discover.rb b/test/test_discover.rb
index 3a51b567..da873728 100644
--- a/test/test_discover.rb
+++ b/test/test_discover.rb
@@ -746,13 +746,9 @@ def test_discover_function
       # XXX these were all different tests in python, but they're
       # combined here so I only have to use with_method_overridden
       # once.
-      discoverXRI = Proc.new { |identifier|
-        return 'XRI'
-      }
+      discoverXRI = Proc.new { |identifier| 'XRI' }
 
-      discoverURI = Proc.new { |identifier|
-        return 'URI'
-      }
+      discoverURI = Proc.new { |identifier| 'URI' }
 
       OpenID.extend(OverrideMethodMixin)
 
diff --git a/test/test_discovery_manager.rb b/test/test_discovery_manager.rb
index 830d0059..9a8abc22 100644
--- a/test/test_discovery_manager.rb
+++ b/test/test_discovery_manager.rb
@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require 'openid/consumer/discovery_manager'
+require 'openid/consumer'
 require 'testutil'
 
 module OpenID
diff --git a/test/test_extras.rb b/test/test_extras.rb
deleted file mode 100644
index ffc89266..00000000
--- a/test/test_extras.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'minitest/autorun'
-
-class StartsWithTestCase < Minitest::Test
-    def test_starts_with
-        [["anything", ""],
-         ["something else", ""],
-         ["", ""],
-         ["foos", "foo"],
-        ].each{|str,target| assert(str.start_with?(target))}
-    end
-
-    def test_not_starts_with
-        [["x", "y"],
-         ["foos", "ball"],
-         ["xx", "xy"],
-        ].each{|str,target| assert(!(str.start_with? target)) }
-    end
-
-    def test_ends_with
-        [["anything", ""],
-         ["something else", " else"],
-         ["", ""],
-         ["foos", "oos"],
-        ].each{|str,target| assert(str.end_with?(target))}
-    end
-
-    def test_not_ends_with
-        [["x", "y"],
-         ["foos", "ball"],
-         ["xx", "xy"],
-         ["foosball", "foosbal"],
-        ].each{|str,target| assert(!(str.end_with? target)) }
-    end
-end
diff --git a/test/test_pape.rb b/test/test_pape.rb
index 2b9ff036..bd35bc78 100644
--- a/test/test_pape.rb
+++ b/test/test_pape.rb
@@ -2,7 +2,7 @@
 require 'openid/extensions/pape'
 require 'openid/message'
 require 'openid/server'
-require 'openid/consumer/responses'
+require 'openid/consumer'
 
 module OpenID
   module PAPETest