diff --git a/greenlock.js b/greenlock.js
index 471eb8c..ec79a62 100644
--- a/greenlock.js
+++ b/greenlock.js
@@ -94,7 +94,7 @@ G.create = function(gconf) {
         // greenlock.challenges.get
         ChWrapper.wrap(greenlock);
 
-        DIR._getDefaultDirectoryUrl('', gconf.staging);
+        DIR._getDefaultDirectoryUrl('', gconf.staging, '');
         if (gconf.directoryUrl) {
             gdefaults.directoryUrl = gconf.directoryUrl;
         }
@@ -388,7 +388,8 @@ G.create = function(gconf) {
         });
 
         var dirUrl = DIR._getDirectoryUrl(
-            args.directoryUrl || mconf.directoryUrl
+            args.directoryUrl || mconf.directoryUrl,
+            args.servername
         );
 
         var dir = caches[dirUrl];
diff --git a/lib/directory-url.js b/lib/directory-url.js
index d022c6c..2594479 100644
--- a/lib/directory-url.js
+++ b/lib/directory-url.js
@@ -1,9 +1,9 @@
 var DIR = module.exports;
 
 // This will ALWAYS print out a notice if the URL is clearly a staging URL
-DIR._getDirectoryUrl = function(dirUrl) {
+DIR._getDirectoryUrl = function(dirUrl, domain) {
     var liveUrl = 'https://acme-v02.api.letsencrypt.org/directory';
-    dirUrl = DIR._getDefaultDirectoryUrl(dirUrl);
+    dirUrl = DIR._getDefaultDirectoryUrl(dirUrl, '', domain);
     if (!dirUrl) {
         dirUrl = liveUrl;
         // This will print out a notice (just once) if no directoryUrl has been supplied
@@ -16,7 +16,7 @@ DIR._getDirectoryUrl = function(dirUrl) {
 };
 
 // Handle staging URLs, pebble test server, etc
-DIR._getDefaultDirectoryUrl = function(dirUrl, staging) {
+DIR._getDefaultDirectoryUrl = function(dirUrl, staging, domain) {
     var stagingUrl = 'https://acme-staging-v02.api.letsencrypt.org/directory';
     var stagingRe = /(^http:|staging|^127\.0\.|^::|localhost)/;
     var env = '';
@@ -36,8 +36,7 @@ DIR._getDefaultDirectoryUrl = function(dirUrl, staging) {
             dirUrl = stagingUrl;
         }
         console.info('[staging] ACME Staging Directory URL:', dirUrl, env);
-        console.warn('');
-        console.warn('FAKE CERTIFICATES (for testing) only', env);
+        console.warn('FAKE CERTIFICATES (for testing) only', env, domain);
         console.warn('');
     }