diff --git a/letsencrypt/plugins/standalone.py b/letsencrypt/plugins/standalone.py
index 4444ed2c1..5f2bc9292 100644
--- a/letsencrypt/plugins/standalone.py
+++ b/letsencrypt/plugins/standalone.py
@@ -44,9 +44,9 @@ class ServerManager(object):
 
         if tls:
             cls = functools.partial(
-                acme_standalone.HTTPSServer, certs=self.certs)
+                acme_standalone.ACMETLSServer, certs=self.certs)
         else:
-            cls = BaseHTTPServer.HTTPServer
+            cls = acme_standalone.ACMEServer
 
         try:
             server = cls(("", port), handler)