diff --git a/subunit2sql/analysis/failures.py b/subunit2sql/analysis/failures.py
index a98e652..dcdbb55 100644
--- a/subunit2sql/analysis/failures.py
+++ b/subunit2sql/analysis/failures.py
@@ -23,7 +23,10 @@ CONF = cfg.CONF
 
 def set_cli_opts(parser):
     parser.add_argument('test_id', nargs='?',
-                        help='Test id to extract time series for'),
+                        help='Test id to extract time series for. This '
+                             'previously took a UUID from the tests.id '
+                             'column, however this will no longer work. It '
+                             'only works with a value from tests.test_id.'),
     parser.add_argument('--success-graph', action='store_true',
                         help='Also graph successes'),
     parser.add_argument('--skip-graph', action='store_true',
@@ -31,8 +34,8 @@ def set_cli_opts(parser):
 
 
 def generate_series():
-    test_id = CONF.command.test_id
     session = api.get_session()
+    test_id = api.get_id_from_test_id(CONF.command.test_id, session)
     test_statuses = api.get_test_status_time_series(test_id, session)
     if not CONF.title:
         test = api.get_test_by_id(test_id, session)
diff --git a/subunit2sql/analysis/run_time.py b/subunit2sql/analysis/run_time.py
index 0f603c9..d7a42a4 100644
--- a/subunit2sql/analysis/run_time.py
+++ b/subunit2sql/analysis/run_time.py
@@ -27,12 +27,15 @@ matplotlib.style.use('ggplot')
 
 def set_cli_opts(parser):
     parser.add_argument('test_id', nargs='?',
-                        help='Test id to extract time series for')
+                        help='Test id to extract time series for. This '
+                             'previously took a UUID from the tests.id '
+                             'column, however this will no longer work. It '
+                             'only works with a value from tests.test_id.')
 
 
 def generate_series():
-    test_id = CONF.command.test_id
     session = api.get_session()
+    test_id = api.get_id_from_test_id(CONF.command.test_id, session)
     run_times = api.get_test_run_time_series(test_id, session)
     if not CONF.title:
         test = api.get_test_by_id(test_id, session)