diff --git a/bin/swift-account-server b/bin/swift-account-server
index 8b9a1ec68c..55e2a10857 100755
--- a/bin/swift-account-server
+++ b/bin/swift-account-server
@@ -20,6 +20,6 @@ from swift.common.wsgi import run_wsgi
 
 if __name__ == '__main__':
     if len(sys.argv) != 2:
-        print "Usage: %s CONFIG_FILE" % sys.argv[0]
+        sys.exit("Usage: %s CONFIG_FILE" % sys.argv[0])
     run_wsgi(sys.argv[1], 'account-server', default_port=6002)
 
diff --git a/bin/swift-auth-server b/bin/swift-auth-server
index 62e1d8b592..2f2a3eeb3d 100755
--- a/bin/swift-auth-server
+++ b/bin/swift-auth-server
@@ -20,6 +20,6 @@ from swift.common.wsgi import run_wsgi
 
 if __name__ == '__main__':
     if len(sys.argv) != 2:
-        print "Usage: %s CONFIG_FILE" % sys.argv[0]
-    run_wsgi(sys.argv[1], 'auth-server', default_port=11000)
+        sys.exit("Usage: %s CONFIG_FILE" % sys.argv[0])
+    run_wsgi(sys.argv[1], 'auth-server', default_port=8080)
 
diff --git a/bin/swift-container-server b/bin/swift-container-server
index 02201041b1..a15a35cf04 100755
--- a/bin/swift-container-server
+++ b/bin/swift-container-server
@@ -20,5 +20,5 @@ from swift.common.wsgi import run_wsgi
 
 if __name__ == '__main__':
     if len(sys.argv) != 2:
-        print "Usage: %s CONFIG_FILE" % sys.argv[0]
+        sys.exit("Usage: %s CONFIG_FILE" % sys.argv[0])
     run_wsgi(sys.argv[1], 'container-server', default_port=6001)
diff --git a/bin/swift-object-server b/bin/swift-object-server
index 58b5120bd8..39c9246d6b 100755
--- a/bin/swift-object-server
+++ b/bin/swift-object-server
@@ -20,5 +20,5 @@ from swift.common.wsgi import run_wsgi
 
 if __name__ == '__main__':
     if len(sys.argv) != 2:
-        print "Usage: %s CONFIG_FILE" % sys.argv[0]
+        sys.exit("Usage: %s CONFIG_FILE" % sys.argv[0])
     run_wsgi(sys.argv[1], 'object-server', default_port=6000)
diff --git a/bin/swift-proxy-server b/bin/swift-proxy-server
index 2ed1b5adf1..7599f87280 100755
--- a/bin/swift-proxy-server
+++ b/bin/swift-proxy-server
@@ -20,5 +20,5 @@ from swift.common.wsgi import run_wsgi
 
 if __name__ == '__main__':
     if len(sys.argv) != 2:
-        print "Usage: %s CONFIG_FILE" % sys.argv[0]
-    run_wsgi(sys.argv[1], 'proxy-server', default_port=80)
+        sys.exit("Usage: %s CONFIG_FILE" % sys.argv[0])
+    run_wsgi(sys.argv[1], 'proxy-server', default_port=8080)