diff --git a/tools/perf/benchmarks/benchmark_smoke_unittest.py b/tools/perf/benchmarks/benchmark_smoke_unittest.py
index 4925783a60e97c..4630c5b1d2a2cf 100644
--- a/tools/perf/benchmarks/benchmark_smoke_unittest.py
+++ b/tools/perf/benchmarks/benchmark_smoke_unittest.py
@@ -10,22 +10,14 @@
 """
 
 import os
-import sys
-import time
 import unittest
 
 from telemetry import benchmark as benchmark_module
 from telemetry.core import discover
+from telemetry.page import page_test
 from telemetry.unittest_util import options_for_unittests
 from telemetry.unittest_util import progress_reporter
 
-from benchmarks import dom_perf
-from benchmarks import indexeddb_perf
-from benchmarks import rasterize_and_record_micro
-from benchmarks import spaceport
-from benchmarks import speedometer
-from benchmarks import jetstream
-
 
 def SmokeTestGenerator(benchmark):
   # NOTE TO SHERIFFS: DO NOT DISABLE THIS TEST.
@@ -64,43 +56,34 @@ def CreatePageSet(self, options):
     benchmark.ProcessCommandLineArgs(None, options)
     benchmark_module.ProcessCommandLineArgs(None, options)
 
-    current = time.time()
-    try:
-      self.assertEqual(0, SinglePageBenchmark().Run(options),
-                       msg='Failed: %s' % benchmark)
-    finally:
-      print 'Benchmark %s run takes %i seconds' % (
-          benchmark.Name(), time.time() - current)
+    self.assertEqual(0, SinglePageBenchmark().Run(options),
+                     msg='Failed: %s' % benchmark)
 
   return BenchmarkSmokeTest
 
 
-# The list of benchmark modules to be excluded from our smoke tests.
-_BLACK_LIST_TEST_MODULES = {
-    dom_perf,   # Always fails on cq bot.
-    indexeddb_perf,  # Always fails on Win7 & Android Tests builder.
-    rasterize_and_record_micro,  # Always fails on cq bot.
-    spaceport,  # Takes 451 seconds.
-    speedometer,  # Takes 101 seconds.
-    jetstream,  # Take 206 seconds.
-}
-
-
 def load_tests(loader, standard_tests, pattern):
   del loader, standard_tests, pattern  # unused
   suite = progress_reporter.TestSuite()
 
   benchmarks_dir = os.path.dirname(__file__)
   top_level_dir = os.path.dirname(benchmarks_dir)
+  measurements_dir = os.path.join(top_level_dir, 'measurements')
 
+  all_measurements = discover.DiscoverClasses(
+      measurements_dir, top_level_dir, page_test.PageTest).values()
   # Using the default of |index_by_class_name=False| means that if a module
   # has multiple benchmarks, only the last one is returned.
   all_benchmarks = discover.DiscoverClasses(
       benchmarks_dir, top_level_dir, benchmark_module.Benchmark,
       index_by_class_name=False).values()
   for benchmark in all_benchmarks:
-    if sys.modules[benchmark.__module__] in _BLACK_LIST_TEST_MODULES:
+    if hasattr(benchmark, 'test') and benchmark.test not in all_measurements:
+      # If the benchmark does not have a measurement, then it is not composable.
+      # Ideally we'd like to test these as well, but the non-composable
+      # benchmarks are usually long-running benchmarks.
       continue
+
     # TODO(tonyg): Smoke doesn't work with session_restore yet.
     if (benchmark.Name().startswith('session_restore') or
         benchmark.Name().startswith('skpicture_printer')):
diff --git a/tools/telemetry/telemetry/user_story/user_story_set.py b/tools/telemetry/telemetry/user_story/user_story_set.py
index d18941cccca675..a0473d7d2447f9 100644
--- a/tools/telemetry/telemetry/user_story/user_story_set.py
+++ b/tools/telemetry/telemetry/user_story/user_story_set.py
@@ -43,7 +43,7 @@ def __init__(self, archive_data_file='', cloud_storage_bucket=None,
     self._cloud_storage_bucket = cloud_storage_bucket
     if base_dir:
       if not os.path.isdir(base_dir):
-        raise ValueError('Invalid directory path of base_dir: %s' % base_dir)
+        raise ValueError('Must provide valid directory path for base_dir.')
       self._base_dir = base_dir
     else:
       self._base_dir = os.path.dirname(inspect.getfile(self.__class__))