diff --git a/letsencrypt/client/tests/config_util.py b/letsencrypt/client/tests/config_util.py
index 4683ab0c2..41e29031a 100644
--- a/letsencrypt/client/tests/config_util.py
+++ b/letsencrypt/client/tests/config_util.py
@@ -8,7 +8,6 @@ import mock
 from letsencrypt.client import CONFIG
 from letsencrypt.client.apache import configurator
 from letsencrypt.client.apache import obj
-from letsencrypt.client.apache import parser
 
 
 def dir_setup(test_dir="debian_apache_2_4/two_vhost_80"):
diff --git a/letsencrypt/scripts/main.py b/letsencrypt/scripts/main.py
index 46fab2779..9030d8f69 100755
--- a/letsencrypt/scripts/main.py
+++ b/letsencrypt/scripts/main.py
@@ -73,7 +73,7 @@ def main():
         display.set_display(display.FileDisplay(sys.stdout))
 
     installer = determine_installer()
-    server = args.server is None and CONFIG.ACME_SERVER or args.server
+    server = CONFIG.ACME_SERVER if args.server is None else args.server
 
     if args.revoke:
         revoc = revoker.Revoker(server, installer)