diff --git a/pkg/pkgbuild.status b/pkg/pkgbuild.status
index 5f14a91309f..293b39c1972 100644
--- a/pkg/pkgbuild.status
+++ b/pkg/pkgbuild.status
@@ -17,3 +17,7 @@ pkg/stack_trace: PubGetError
 
 [ $use_public_packages ]
 pkg/watcher: PubGetError # Issue 16026
+
+[ $builder_tag == russian ]
+samples/third_party/angular_todo: Fail # Issue 16356 
+samples/third_party/pop-pop-win: Fail # Issue 16356
diff --git a/tools/bots/bot.py b/tools/bots/bot.py
index 53af19d380a..ad0ad0038b9 100644
--- a/tools/bots/bot.py
+++ b/tools/bots/bot.py
@@ -40,11 +40,12 @@ class BuildInfo(object):
   - arch: The architecture to build on.
   - dart2js_full: Boolean indicating whether this builder will run dart2js
     on several different runtimes.
+  - builder_tag: A tag indicating a special builder setup.
   """
   def __init__(self, compiler, runtime, mode, system, checked=False,
                host_checked=False, minified=False, shard_index=None,
                total_shards=None, is_buildbot=False, test_set=None,
-               csp=None, arch=None, dart2js_full=False):
+               csp=None, arch=None, dart2js_full=False, builder_tag=None):
     self.compiler = compiler
     self.runtime = runtime
     self.mode = mode
@@ -58,6 +59,7 @@ class BuildInfo(object):
     self.test_set = test_set
     self.csp = csp
     self.dart2js_full = dart2js_full
+    self.builder_tag = builder_tag
     if (arch == None):
       self.arch = 'ia32'
     else:
diff --git a/tools/bots/pub.py b/tools/bots/pub.py
index 12c73c9b2c8..73db559483d 100755
--- a/tools/bots/pub.py
+++ b/tools/bots/pub.py
@@ -15,7 +15,7 @@ import sys
 
 import bot
 
-PUB_BUILDER = r'pub-(linux|mac|win)(-russian)?'
+PUB_BUILDER = r'pub-(linux|mac|win)(-(russian))?'
 
 def PubConfig(name, is_buildbot):
   """Returns info for the current buildbot based on the name of the builder.
@@ -29,9 +29,11 @@ def PubConfig(name, is_buildbot):
     return None
 
   system = pub_pattern.group(1)
+  locale = pub_pattern.group(3)
   if system == 'win': system = 'windows'
 
-  return bot.BuildInfo('none', 'vm', 'release', system, checked=True)
+  return bot.BuildInfo('none', 'vm', 'release', system, checked=True,
+                       builder_tag=locale)
 
 
 def PubSteps(build_info):
@@ -41,17 +43,19 @@ def PubSteps(build_info):
     print 'Building package-root: %s' % (' '.join(args))
     bot.RunProcess(args)
 
-  bot.RunTest('pub', build_info, ['--write-test-outcome-log',
-      'pub', 'pkg', 'dartdoc', 'docs'])
+  common_args = ['--write-test-outcome-log']
+  if build_info.builder_tag:
+    common_args.append('--builder-tag=%s' % build_info.builder_tag)
+                 
+  bot.RunTest('pub', build_info,
+              common_args + ['pub', 'pkg', 'dartdoc', 'docs'])
 
   pkgbuild_build_info = bot.BuildInfo('none', 'vm', 'release',
       build_info.system, checked=False)
   bot.RunTest('pkgbuild_repo_pkgs', pkgbuild_build_info,
-      ['--append_logs', '--write-test-outcome-log',
-       '--use-repository-packages', 'pkgbuild'])
+      common_args + ['--append_logs', '--use-repository-packages', 'pkgbuild'])
   bot.RunTest('pkgbuild_public_pkgs', pkgbuild_build_info,
-      ['--append_logs', '--write-test-outcome-log',
-       '--use-public-packages', 'pkgbuild'])
+      common_args + ['--append_logs', '--use-public-packages', 'pkgbuild'])
 
 if __name__ == '__main__':
   bot.RunBot(PubConfig, PubSteps)
diff --git a/tools/testing/dart/test_options.dart b/tools/testing/dart/test_options.dart
index a9b407ed389..28e90148466 100644
--- a/tools/testing/dart/test_options.dart
+++ b/tools/testing/dart/test_options.dart
@@ -383,6 +383,14 @@ Note: currently only implemented for dart2js.''',
               ['--replay_from_file'],
               [],
               null),
+          new _TestOptionSpecification(
+              'builder_tag',
+              'Machine specific options that is not captured by the regular '
+              'test options. Used to be able to make sane updates to the '
+              'status files.',
+              ['--builder-tag'],
+              [],
+              null),
           new _TestOptionSpecification(
               'vm_options',
               'Extra options to send to the vm when running',