diff --git a/lib/cli.js b/lib/cli.js
index f742019..aaff4a2 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -197,14 +197,16 @@ var command = {
       log.error('An API key for WebPageTest must be specified.')
       return 1
     }
-    // Set env variables as option
-    if (process.env.PERFLINT_KEY) opts.key = process.env.PERFLINT_KEY
 
     if (!opts.URL && !opts.test) {
       log.error('A URL or WebPageTest test ID must be specified.')
       return 1
     }
 
+    // Set env variables as option
+    if (process.env.PERFLINT_KEY) opts.key = process.env.PERFLINT_KEY
+    if (process.env.PERFLINT_SERVER) opts.server = process.env.PERFLINT_SERVER
+
     var config
     if (opts.config) {
       config = command.getConfig(opts.config)