diff --git a/mozdownload/scraper.py b/mozdownload/scraper.py
index bc016b70..b65fa795 100755
--- a/mozdownload/scraper.py
+++ b/mozdownload/scraper.py
@@ -702,14 +702,15 @@ def binary_regex(self):
                         'linux64': r'.*\.%(EXT)s$',
                         'mac': r'.*\.%(EXT)s$',
                         'mac64': r'.*\.%(EXT)s$',
-                        'win32': r'.*(\.installer)\.%(EXT)s$',
-                        'win64': r'.*(\.installer)\.%(EXT)s$'}
+                        'win32': r'.*(\.installer%(STUB)s)\.%(EXT)s$',
+                        'win64': r'.*(\.installer%(STUB)s)\.%(EXT)s$'}
 
         regex = regex_base_name + regex_suffix[self.platform]
 
         return regex % {'APP': self.application,
                         'LOCALE': self.locale,
                         'PLATFORM': PLATFORM_FRAGMENTS[self.platform],
+                        'STUB': '-stub' if self.is_stub_installer else '',
                         'EXT': self.extension}
 
     def build_filename(self, binary):
diff --git a/tests/tinderbox_scraper/test_tinderbox_scraper.py b/tests/tinderbox_scraper/test_tinderbox_scraper.py
index c8a60be9..ab53b25e 100644
--- a/tests/tinderbox_scraper/test_tinderbox_scraper.py
+++ b/tests/tinderbox_scraper/test_tinderbox_scraper.py
@@ -30,6 +30,13 @@
      'target': 'mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
      'target_url': 'firefox/tinderbox-builds/mozilla-central-win32/'
                    '1374583608/firefox-25.0a1.en-US.win32.installer.exe'},
+    # -a firefox -p win32 --stub
+    {'args': {'application': 'firefox',
+              'platform': 'win32',
+              'is_stub_installer': True},
+     'target': 'mozilla-central-firefox-25.0a1.en-US.win32.installer-stub.exe',
+     'target_url': 'firefox/tinderbox-builds/mozilla-central-win32/'
+                   '1374583608/firefox-25.0a1.en-US.win32.installer-stub.exe'},
     # -a firefox -p linux --branch=mozilla-central
     {'args': {'branch': 'mozilla-central',
               'platform': 'linux'},