diff --git a/test/network/server/mongrel_test.rb b/test/network/server/mongrel_test.rb
index 7bb2df150..d675b42f7 100755
--- a/test/network/server/mongrel_test.rb
+++ b/test/network/server/mongrel_test.rb
@@ -1,105 +1,99 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
 
 class TestMongrelServer < PuppetTest::TestCase
   confine "Missing mongrel" => Puppet.features.mongrel?
 
   include PuppetTest::ServerTest
 
   def mkserver(handlers = nil)
     handlers ||= { :Status => nil }
     mongrel = Puppet::Network::HTTPServer::Mongrel.new(handlers)
   end
 
   # Make sure client info is correctly extracted.
   def test_client_info
     obj = Object.new
     obj.singleton_class.send(:attr_accessor, :params)
     params = {}
     obj.params = params
 
     mongrel = mkserver
 
     ip = Facter.value(:ipaddress)
     params["REMOTE_ADDR"] = ip
     params[Puppet[:ssl_client_header]] = ""
     params[Puppet[:ssl_client_verify_header]] = "failure"
     info = nil
     Resolv.expects(:getname).with(ip).returns("host.domain.com").times(4)
     assert_nothing_raised("Could not call client_info") do
       info = mongrel.send(:client_info, obj)
     end
     assert(! info.authenticated?, "Client info object was marked valid even though headers were missing")
     assert_equal(ip, info.ip, "Did not copy over ip correctly")
 
     assert_equal("host.domain.com", info.name, "Did not copy over hostname correctly")
 
     # Now pass the X-Forwarded-For header and check it is preferred over REMOTE_ADDR
     params["REMOTE_ADDR"] = '127.0.0.1'
     params["HTTP_X_FORWARDED_FOR"] = ip
     info = nil
     assert_nothing_raised("Could not call client_info") do
       info = mongrel.send(:client_info, obj)
     end
     assert(! info.authenticated?, "Client info object was marked valid even though headers were missing")
     assert_equal(ip, info.ip, "Did not copy over ip correctly")
 
     assert_equal("host.domain.com", info.name, "Did not copy over hostname correctly")
 
     # Now add a valid auth header.
     params["REMOTE_ADDR"] = ip
     params["HTTP_X_FORWARDED_FOR"] = nil
     params[Puppet[:ssl_client_header]] = "/CN=host.domain.com"
     assert_nothing_raised("Could not call client_info") do
       info = mongrel.send(:client_info, obj)
     end
     assert(! info.authenticated?, "Client info object was marked valid even though the verify header was fals")
     assert_equal(ip, info.ip, "Did not copy over ip correctly")
     assert_equal("host.domain.com", info.name, "Did not copy over hostname correctly")
 
     # Now change the verify header to be true
     params[Puppet[:ssl_client_verify_header]] = "SUCCESS"
     assert_nothing_raised("Could not call client_info") do
       info = mongrel.send(:client_info, obj)
     end
 
     assert(info.authenticated?, "Client info object was not marked valid even though all headers were correct")
     assert_equal(ip, info.ip, "Did not copy over ip correctly")
     assert_equal("host.domain.com", info.name, "Did not copy over hostname correctly")
 
     # Now try it with a different header name
     params.delete(Puppet[:ssl_client_header])
     Puppet[:ssl_client_header] = "header_testing"
     params["header_testing"] = "/CN=other.domain.com"
     info = nil
     assert_nothing_raised("Could not call client_info with other header") do
       info = mongrel.send(:client_info, obj)
     end
 
     assert(info.authenticated?, "Client info object was not marked valid even though the header was present")
     assert_equal(ip, info.ip, "Did not copy over ip correctly")
     assert_equal("other.domain.com", info.name, "Did not copy over hostname correctly")
 
     # Now make sure it's considered invalid without that header
     params.delete("header_testing")
     info = nil
     assert_nothing_raised("Could not call client_info with no header") do
       info = mongrel.send(:client_info, obj)
     end
 
     assert(! info.authenticated?, "Client info object was marked valid without header")
     assert_equal(ip, info.ip, "Did not copy over ip correctly")
     assert_equal(Resolv.getname(ip), info.name, "Did not look up hostname correctly")
   end
-
-  def test_daemonize
-    mongrel = mkserver
-
-    assert(mongrel.respond_to?(:daemonize), "Mongrel server does not respond to daemonize")
-  end
 end