diff --git a/os_testr/os_testr.py b/os_testr/os_testr.py
new file mode 100755
index 0000000..ff9918a
--- /dev/null
+++ b/os_testr/os_testr.py
@@ -0,0 +1,129 @@
+#!/usr/bin/env python2
+# Copyright 2015 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import copy
+import os
+import subprocess
+import sys
+
+import argparse
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(
+        description='Tool to run openstack tests')
+    parser.add_argument('--blacklist_file', '-b',
+                        help='Path to a blacklist file, this file contains a'
+                             ' separate regex exclude on each newline')
+    parser.add_argument('--regex', '-r',
+                        help='A normal testr selection regex. If a blacklist '
+                             'file is specified, the regex will be appended '
+                             'to the end of the generated regex from that '
+                             'file')
+    parser.add_argument('--pretty', '-p', default=True,
+                        help='Print pretty output from subunit-trace. This is '
+                             'mutually exclusive with --subunit')
+    parser.add_argument('--subunit', '-s', action='store_true',
+                        help='output the raw subunit v2 from the test run '
+                             'this is mutuall exclusive with --pretty')
+    parser.add_argument('--list', '-l', action='store_true',
+                        help='List all the tests which will be run.')
+    parser.add_argument('--no-discover', '-n',
+                        help="Takes in a single test to bypasses test "
+                             "discover and just excute the test specified")
+    parser.add_argument('--slowest', default=True,
+                        help="after the test run print the slowest tests")
+    opts = parser.parse_args()
+    return opts
+
+
+def construct_regex(blacklist_file, regex):
+    if not blacklist_file:
+        exclude_regex = ''
+    else:
+        black_file = open(blacklist_file, 'r')
+        exclude_regex = ''
+        for line in black_file:
+            regex = line.strip()
+            exclude_regex = '|'.join([regex, exclude_regex])
+        if exclude_regex:
+            exclude_regex = "'(?!.*" + exclude_regex + ")"
+    if regex:
+        exclude_regex += regex
+    return exclude_regex
+
+
+def call_testr(regex, subunit, pretty, list_tests, slowest):
+    cmd = ['testr', 'run', '--parallel']
+
+    if list_tests:
+        cmd = ['testr', 'list-tests']
+    elif subunit or pretty:
+        cmd.append('--subunit')
+    cmd.append(regex)
+    env = copy.deepcopy(os.environ)
+    if pretty and not list_tests:
+        ps = subprocess.Popen(cmd, env=env, stdout=subprocess.PIPE)
+        proc = subprocess.Popen(['subunit-trace', '--no-failure-debug', '-f'],
+                                env=env, stdin=ps.stdout)
+        ps.stdout.close()
+    else:
+        proc = subprocess.Popen(cmd, env=env)
+    return_code = proc.communicate()[0]
+    if slowest and not list_tests:
+        print("\nSlowest Tests:\n")
+        slow_proc = subprocess.Popen(['testr', 'slowest'], env=env)
+        slow_proc.communicate()
+    return return_code
+
+
+def call_subunit_run(test_id, pretty):
+    cmd = ['python', '-m', 'subunit.run', test_id]
+    env = copy.deepcopy(os.environ)
+    if pretty:
+        ps = subprocess.Popen(cmd, env=env, stdout=subprocess.PIPE)
+        proc = subprocess.Popen(['subunit-trace', '--no-failure-debug', '-f'],
+                                env=env, stdin=ps.stdout)
+        ps.stdout.close()
+    else:
+        proc = subprocess.Popen(cmd, env=env)
+    proc = subprocess.Popen(cmd)
+    return_code = proc.communicate()[0]
+    return return_code
+
+
+def main():
+    opts = parse_args()
+    if opts.pretty and opts.subunit:
+        msg = ('Subunit output and pretty output cannot be specified at the '
+               'same time')
+        print(msg)
+        exit(2)
+    if opts.list and opts.no_discover:
+        msg = ('you can not list tests when you are bypassing discovery to '
+               'run a single test')
+        print(msg)
+        exit(3)
+    exclude_regex = construct_regex(opts.blacklist_file, opts.regex)
+    if not os.path.isdir('.testrepository'):
+        subprocess.call('testr init')
+    if not opts.no_discover:
+        exit(call_testr(exclude_regex, opts.subunit, opts.pretty, opts.list,
+                        opts.slowest))
+    else:
+        exit(call_subunit_run(opts.no_discover, opts.pretty))
+
+if __name__ == '__main__':
+    main()
diff --git a/os_testr/subunit_trace.py b/os_testr/subunit_trace.py
new file mode 100755
index 0000000..5b69fb6
--- /dev/null
+++ b/os_testr/subunit_trace.py
@@ -0,0 +1,279 @@
+#!/usr/bin/env python
+
+# Copyright 2014 Hewlett-Packard Development Company, L.P.
+# Copyright 2014 Samsung Electronics
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+"""Trace a subunit stream in reasonable detail and high accuracy."""
+
+import argparse
+import datetime
+import functools
+import os
+import re
+import sys
+
+import subunit
+import testtools
+
+DAY_SECONDS = 60 * 60 * 24
+FAILS = []
+RESULTS = {}
+
+
+def total_seconds(timedelta):
+    # NOTE(mtreinish): This method is built-in to the timedelta class in
+    # python >= 2.7 it is here to enable it's use on older versions
+    return ((timedelta.days * DAY_SECONDS + timedelta.seconds) * 10 ** 6 +
+            timedelta.microseconds) / 10 ** 6
+
+
+def cleanup_test_name(name, strip_tags=True, strip_scenarios=False):
+    """Clean up the test name for display.
+
+    By default we strip out the tags in the test because they don't help us
+    in identifying the test that is run to it's result.
+
+    Make it possible to strip out the testscenarios information (not to
+    be confused with tempest scenarios) however that's often needed to
+    indentify generated negative tests.
+    """
+    if strip_tags:
+        tags_start = name.find('[')
+        tags_end = name.find(']')
+        if tags_start > 0 and tags_end > tags_start:
+            newname = name[:tags_start]
+            newname += name[tags_end + 1:]
+            name = newname
+
+    if strip_scenarios:
+        tags_start = name.find('(')
+        tags_end = name.find(')')
+        if tags_start > 0 and tags_end > tags_start:
+            newname = name[:tags_start]
+            newname += name[tags_end + 1:]
+            name = newname
+
+    return name
+
+
+def get_duration(timestamps):
+    start, end = timestamps
+    if not start or not end:
+        duration = ''
+    else:
+        delta = end - start
+        duration = '%d.%06ds' % (
+            delta.days * DAY_SECONDS + delta.seconds, delta.microseconds)
+    return duration
+
+
+def find_worker(test):
+    """Get the worker number.
+
+    If there are no workers because we aren't in a concurrent environment,
+    assume the worker number is 0.
+    """
+    for tag in test['tags']:
+        if tag.startswith('worker-'):
+            return int(tag[7:])
+    return 0
+
+
+# Print out stdout/stderr if it exists, always
+def print_attachments(stream, test, all_channels=False):
+    """Print out subunit attachments.
+
+    Print out subunit attachments that contain content. This
+    runs in 2 modes, one for successes where we print out just stdout
+    and stderr, and an override that dumps all the attachments.
+    """
+    channels = ('stdout', 'stderr')
+    for name, detail in test['details'].items():
+        # NOTE(sdague): the subunit names are a little crazy, and actually
+        # are in the form pythonlogging:'' (with the colon and quotes)
+        name = name.split(':')[0]
+        if detail.content_type.type == 'test':
+            detail.content_type.type = 'text'
+        if (all_channels or name in channels) and detail.as_text():
+            title = "Captured %s:" % name
+            stream.write("\n%s\n%s\n" % (title, ('~' * len(title))))
+            # indent attachment lines 4 spaces to make them visually
+            # offset
+            for line in detail.as_text().split('\n'):
+                stream.write("    %s\n" % line)
+
+
+def show_outcome(stream, test, print_failures=False, failonly=False):
+    global RESULTS
+    status = test['status']
+    # TODO(sdague): ask lifeless why on this?
+    if status == 'exists':
+        return
+
+    worker = find_worker(test)
+    name = cleanup_test_name(test['id'])
+    duration = get_duration(test['timestamps'])
+
+    if worker not in RESULTS:
+        RESULTS[worker] = []
+    RESULTS[worker].append(test)
+
+    # don't count the end of the return code as a fail
+    if name == 'process-returncode':
+        return
+
+    if status == 'fail':
+        FAILS.append(test)
+        stream.write('{%s} %s [%s] ... FAILED\n' % (
+            worker, name, duration))
+        if not print_failures:
+            print_attachments(stream, test, all_channels=True)
+    elif not failonly:
+        if status == 'success':
+            stream.write('{%s} %s [%s] ... ok\n' % (
+                worker, name, duration))
+            print_attachments(stream, test)
+        elif status == 'skip':
+            stream.write('{%s} %s ... SKIPPED: %s\n' % (
+                worker, name, test['details']['reason'].as_text()))
+        else:
+            stream.write('{%s} %s [%s] ... %s\n' % (
+                worker, name, duration, test['status']))
+            if not print_failures:
+                print_attachments(stream, test, all_channels=True)
+
+    stream.flush()
+
+
+def print_fails(stream):
+    """Print summary failure report.
+
+    Currently unused, however there remains debate on inline vs. at end
+    reporting, so leave the utility function for later use.
+    """
+    if not FAILS:
+        return
+    stream.write("\n==============================\n")
+    stream.write("Failed %s tests - output below:" % len(FAILS))
+    stream.write("\n==============================\n")
+    for f in FAILS:
+        stream.write("\n%s\n" % f['id'])
+        stream.write("%s\n" % ('-' * len(f['id'])))
+        print_attachments(stream, f, all_channels=True)
+    stream.write('\n')
+
+
+def count_tests(key, value):
+    count = 0
+    for k, v in RESULTS.items():
+        for item in v:
+            if key in item:
+                if re.search(value, item[key]):
+                    count += 1
+    return count
+
+
+def run_time():
+    runtime = 0.0
+    for k, v in RESULTS.items():
+        for test in v:
+            runtime += float(get_duration(test['timestamps']).strip('s'))
+    return runtime
+
+
+def worker_stats(worker):
+    tests = RESULTS[worker]
+    num_tests = len(tests)
+    delta = tests[-1]['timestamps'][1] - tests[0]['timestamps'][0]
+    return num_tests, delta
+
+
+def print_summary(stream, elapsed_time):
+    stream.write("\n======\nTotals\n======\n")
+    stream.write("Ran: %s tests in %.4f sec.\n" % (
+        count_tests('status', '.*'), total_seconds(elapsed_time)))
+    stream.write(" - Passed: %s\n" % count_tests('status', '^success$'))
+    stream.write(" - Skipped: %s\n" % count_tests('status', '^skip$'))
+    stream.write(" - Expected Fail: %s\n" % count_tests('status', '^xfail$'))
+    stream.write(" - Unexpected Success: %s\n" % count_tests('status',
+                                                             '^uxsuccess$'))
+    stream.write(" - Failed: %s\n" % count_tests('status', '^fail$'))
+    stream.write("Sum of execute time for each test: %.4f sec.\n" % run_time())
+
+    # we could have no results, especially as we filter out the process-codes
+    if RESULTS:
+        stream.write("\n==============\nWorker Balance\n==============\n")
+
+        for w in range(max(RESULTS.keys()) + 1):
+            if w not in RESULTS:
+                stream.write(
+                    " - WARNING: missing Worker %s! "
+                    "Race in testr accounting.\n" % w)
+            else:
+                num, time = worker_stats(w)
+                stream.write(" - Worker %s (%s tests) => %ss\n" %
+                             (w, num, time))
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--no-failure-debug', '-n', action='store_true',
+                        dest='print_failures', help='Disable printing failure '
+                        'debug information in realtime')
+    parser.add_argument('--fails', '-f', action='store_true',
+                        dest='post_fails', help='Print failure debug '
+                        'information after the stream is proccesed')
+    parser.add_argument('--failonly', action='store_true',
+                        dest='failonly', help="Don't print success items",
+                        default=(
+                            os.environ.get('TRACE_FAILONLY', False)
+                            is not False))
+    return parser.parse_args()
+
+
+def main():
+    args = parse_args()
+    stream = subunit.ByteStreamToStreamResult(
+        sys.stdin, non_subunit_name='stdout')
+    outcomes = testtools.StreamToDict(
+        functools.partial(show_outcome, sys.stdout,
+                          print_failures=args.print_failures,
+                          failonly=args.failonly))
+    summary = testtools.StreamSummary()
+    result = testtools.CopyStreamResult([outcomes, summary])
+    result = testtools.StreamResultRouter(result)
+    cat = subunit.test_results.CatFiles(sys.stdout)
+    result.add_rule(cat, 'test_id', test_id=None)
+    start_time = datetime.datetime.utcnow()
+    result.startTestRun()
+    try:
+        stream.run(result)
+    finally:
+        result.stopTestRun()
+    stop_time = datetime.datetime.utcnow()
+    elapsed_time = stop_time - start_time
+
+    if count_tests('status', '.*') == 0:
+        print("The test run didn't actually run any tests")
+        exit(1)
+    if args.post_fails:
+        print_fails(sys.stdout)
+    print_summary(sys.stdout, elapsed_time)
+    exit(0 if summary.wasSuccessful() else 1)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/requirements.txt b/requirements.txt
index 95137a6..9b50a0b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,5 @@
 
 pbr>=0.6,!=0.7,<1.0
 Babel>=1.3
+testrepository>=0.0.18
+python-subunit>=0.0.18
diff --git a/setup.cfg b/setup.cfg
index 57f7046..0f883c5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,6 +24,11 @@ classifier =
 packages =
     os_testr
 
+[entry_points]
+console_scripts =
+    subunit-trace = os_testr.subunit_trace:main
+    ostestr = os_testr.os_testr:main
+
 [build_sphinx]
 source-dir = doc/source
 build-dir = doc/build