diff --git a/indra/llcorehttp/tests/test_httprequest.hpp b/indra/llcorehttp/tests/test_httprequest.hpp
index ed4e239fe7948a75419462c069183b8e3517f92e..914f35ec3db21e6b77238fc4f89ef231a4b9904f 100644
--- a/indra/llcorehttp/tests/test_httprequest.hpp
+++ b/indra/llcorehttp/tests/test_httprequest.hpp
@@ -1381,8 +1381,6 @@ void HttpRequestTestObjectType::test<13>()
 }
 
 
-// *NB:  This test must be last.  The sleeping webserver
-// won't respond for a long time.
 template <> template <>
 void HttpRequestTestObjectType::test<14>()
 {
@@ -1503,9 +1501,6 @@ void HttpRequestTestObjectType::test<14>()
 		throw;
 	}
 }
-// *NOTE:  This test ^^^^^^^^ must be the last one in the set.  It uses a
-// sleeping service that interferes with other HTTP tests.  Keep it
-// last until that little HTTP server can get some attention...
 
 }  // end namespace tut
 
diff --git a/indra/llcorehttp/tests/test_llcorehttp_peer.py b/indra/llcorehttp/tests/test_llcorehttp_peer.py
index 0e38e5a87fcc6b1376ec0456f79077e1ba08031e..9e1847c66ec0d4f836823604e3d23a0a3bed44c3 100644
--- a/indra/llcorehttp/tests/test_llcorehttp_peer.py
+++ b/indra/llcorehttp/tests/test_llcorehttp_peer.py
@@ -32,10 +32,12 @@
 import os
 import sys
 import time
+import select
 from threading import Thread
 from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
+from SocketServer import ThreadingMixIn
 
-mydir = os.path.dirname(__file__)       # expected to be .../indra/llmessage/tests/
+mydir = os.path.dirname(__file__)       # expected to be .../indra/llcorehttp/tests/
 sys.path.insert(0, os.path.join(mydir, os.pardir, os.pardir, "lib", "python"))
 from indra.util.fastest_elementtree import parse as xml_parse
 from indra.base import llsd
@@ -144,7 +146,7 @@ def log_error(self, format, *args):
             # Suppress error output as well
             pass
 
-class Server(HTTPServer):
+class Server(ThreadingMixIn, HTTPServer):
     # This pernicious flag is on by default in HTTPServer. But proper
     # operation of freeport() absolutely depends on it being off.
     allow_reuse_address = False