--- a/build/moz.configure/java.configure
+++ b/build/moz.configure/java.configure
@@ -90,18 +90,19 @@ option(env='PROGUARD_JAR', nargs=1, defa
 @checking('for proguard.jar version')
 # Do not change, this is fragile!  This form works with the test
 # configure sandbox.
 @imports(_from='os', _import='path')
 @imports('subprocess')
 def valid_proguard(java, proguard_jar):
     if not proguard_jar or not path.isfile(proguard_jar[0]):
         die('proguard.jar 5.3.3 or higher is required (looked for {}). '
-            'Run |mach artifact install --from-build proguard-jar| or add '
-            '`export PROGUARD_JAR=/path/to/proguard.jar` to your mozconfig.'
+            'Run |mach artifact toolchain --from-build proguard-jar && mv '
+            'proguard ~/.mozbuild/| or add `export PROGUARD_JAR=/path/to/'
+            'proguard.jar` to your mozconfig.'
             .format(proguard_jar[0]))
 
     try:
         output = subprocess.check_output([java, '-jar', proguard_jar[0]])
         # Exit code zero shouldn't happen.
         die('Expected `java -jar {}` to fail (with version in output) '
             'but got exit code 0'
             .format(proguard_jar[0]))

--- a/python/mozbuild/mozbuild/test/configure/test_checks_configure.py
+++ b/python/mozbuild/mozbuild/test/configure/test_checks_configure.py
@@ -671,17 +671,17 @@ class TestChecksConfigure(unittest.TestC
              checking for java... %s
              checking for javah... %s
              checking for jar... %s
              checking for jarsigner... %s
              checking for keytool... %s
              checking for javac... %s
              checking for javac version... 1.8
              checking for proguard.jar version... 
-             ERROR: proguard.jar 5.3.3 or higher is required (looked for %s). Run |mach artifact install --from-build proguard-jar| or add `export PROGUARD_JAR=/path/to/proguard.jar` to your mozconfig.
+             ERROR: proguard.jar 5.3.3 or higher is required (looked for %s). Run |mach artifact toolchain --from-build proguard-jar && mv proguard ~/.mozbuild/| or add `export PROGUARD_JAR=/path/to/proguard.jar` to your mozconfig.
         ''' % (java, javah, jar, jarsigner, keytool, javac, old_proguard_jar)))
         self.assertEqual(status, 1)
         self.assertEqual(config, {
             'JAVA': java,
             'JAVAH': javah,
             'JAVAC': javac,
             'JAR': jar,
             'JARSIGNER': jarsigner,