--- a/python/mozbuild/mozbuild/mozinfo.py
+++ b/python/mozbuild/mozbuild/mozinfo.py
@@ -103,16 +103,20 @@ def build_dict(config, env=os.environ):
                 p = 'macosx64'
             elif d['bits'] == 64:
                 p = '{}64'.format(p)
             elif p in ('win',):
                 p = '{}32'.format(p)
 
             if d['buildapp'] == 'mulet':
                 p = '{}-mulet'.format(p)
+
+            if d['asan']:
+                p = '{}-asan'.format(p)
+
             return p
 
         if d['buildapp'] == 'b2g':
             if d['toolkit'] == 'gonk':
                 return 'emulator'
 
             if d['bits'] == 64:
                 return 'linux64_gecko'
@@ -123,18 +127,16 @@ def build_dict(config, env=os.environ):
                 return 'android-x86'
             return 'android-arm'
 
     def guess_buildtype():
         if d['debug']:
             return 'debug'
         if d['pgo']:
             return 'pgo'
-        if d['asan']:
-            return 'asan'
         return 'opt'
 
     # if buildapp or bits are unknown, we don't have a configuration similar to
     # any in automation and the guesses are useless.
     if 'buildapp' in d and (d['os'] == 'mac' or 'bits' in d):
         d['platform_guess'] = guess_platform()
         d['buildtype_guess'] = guess_buildtype()