Make Python testing predictable again

This reorganizes the Python code, scraps the current testing
infrastructure, and implements a simple test discovery and run script
based on the standard Python unittest library so we can trust that our
tests are running.

116 files changed, 1217 insertions, 458 deletions

diff --git a/src/python/grpcio/.gitignore b/src/python/grpcio/.gitignore
index 4c02b8d14d..b5db3b3cfb 100644
--- a/src/python/grpcio/.gitignore
+++ b/src/python/grpcio/.gitignore
@@ -5,5 +5,10 @@ dist/
 *.egg
 *.egg/
 *.eggs/
+*_pb2.py
+.coverage
+.coverage.*
+.cache/
+nosetests.xml
 doc/
 _grpcio_metadata.py
diff --git a/src/python/grpcio/MANIFEST.in b/src/python/grpcio/MANIFEST.in
index 9583dc7768..407eeabc17 100644
--- a/src/python/grpcio/MANIFEST.in
+++ b/src/python/grpcio/MANIFEST.in
@@ -1,3 +1,4 @@
 graft grpc
+graft tests
 include commands.py
 include requirements.txt
diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
index 8a2f2d6283..d9fd023b21 100644
--- a/src/python/grpcio/commands.py
+++ b/src/python/grpcio/commands.py
@@ -29,14 +29,18 @@
 
 """Provides distutils command classes for the GRPC Python setup process."""
 
+import distutils
 import os
 import os.path
+import re
+import subprocess
 import sys
 
 import setuptools
 from setuptools.command import build_py
+from setuptools.command import test
 
-_CONF_PY_ADDENDUM = """
+CONF_PY_ADDENDUM = """
 extensions.append('sphinx.ext.napoleon')
 napoleon_google_docstring = True
 napoleon_numpy_docstring = True
@@ -48,7 +52,7 @@ html_theme = 'sphinx_rtd_theme'
 class SphinxDocumentation(setuptools.Command):
   """Command to generate documentation via sphinx."""
 
-  description = ''
+  description = 'generate sphinx documentation'
   user_options = []
 
   def initialize_options(self):
@@ -72,14 +76,61 @@ class SphinxDocumentation(setuptools.Command):
         '-o', os.path.join('doc', 'src'), src_dir])
     conf_filepath = os.path.join('doc', 'src', 'conf.py')
     with open(conf_filepath, 'a') as conf_file:
-      conf_file.write(_CONF_PY_ADDENDUM)
+      conf_file.write(CONF_PY_ADDENDUM)
     sphinx.main(['', os.path.join('doc', 'src'), os.path.join('doc', 'build')])
 
 
+class BuildProtoModules(setuptools.Command):
+  """Command to generate project *_pb2.py modules from proto files."""
+
+  description = 'build protobuf modules'
+  user_options = [
+    ('include=', None, 'path patterns to include in protobuf generation'),
+    ('exclude=', None, 'path patterns to exclude from protobuf generation')
+  ]
+
+  def initialize_options(self):
+    self.exclude = None
+    self.include = r'.*\.proto$'
+    self.protoc_command = None
+    self.grpc_python_plugin_command = None
+
+  def finalize_options(self):
+    self.protoc_command = distutils.spawn.find_executable('protoc')
+    self.grpc_python_plugin_command = distutils.spawn.find_executable(
+        'grpc_python_plugin')
+
+  def run(self):
+    include_regex = re.compile(self.include)
+    exclude_regex = re.compile(self.exclude) if self.exclude else None
+    paths = []
+    root_directory = os.getcwd()
+    for walk_root, directories, filenames in os.walk(root_directory):
+      for filename in filenames:
+        path = os.path.join(walk_root, filename)
+        if include_regex.match(path) and not (
+            exclude_regex and exclude_regex.match(path)):
+          paths.append(path)
+    command = [
+        self.protoc_command,
+        '--plugin=protoc-gen-python-grpc={}'.format(
+            self.grpc_python_plugin_command),
+        '-I {}'.format(root_directory),
+        '--python_out={}'.format(root_directory),
+        '--python-grpc_out={}'.format(root_directory),
+    ] + paths
+    try:
+      subprocess.check_output(' '.join(command), cwd=root_directory, shell=True,
+                              stderr=subprocess.STDOUT)
+    except subprocess.CalledProcessError as e:
+      raise Exception('Command:\n{}\nMessage:\n{}\nOutput:\n{}'.format(
+          command, e.message, e.output))
+
+
 class BuildProjectMetadata(setuptools.Command):
   """Command to generate project metadata in a module."""
 
-  description = ''
+  description = 'build grpcio project metadata files'
   user_options = []
 
   def initialize_options(self):
@@ -98,5 +149,73 @@ class BuildPy(build_py.build_py):
   """Custom project build command."""
 
   def run(self):
+    self.run_command('build_proto_modules')
     self.run_command('build_project_metadata')
     build_py.build_py.run(self)
+
+
+class Gather(setuptools.Command):
+  """Command to gather project dependencies."""
+
+  description = 'gather dependencies for grpcio'
+  user_options = [
+    ('test', 't', 'flag indicating to gather test dependencies'),
+    ('install', 'i', 'flag indicating to gather install dependencies')
+  ]
+
+  def initialize_options(self):
+    self.test = False
+    self.install = False
+
+  def finalize_options(self):
+    # distutils requires this override.
+    pass
+
+  def run(self):
+    if self.install and self.distribution.install_requires:
+      self.distribution.fetch_build_eggs(self.distribution.install_requires)
+    if self.test and self.distribution.tests_require:
+      self.distribution.fetch_build_eggs(self.distribution.tests_require)
+
+
+class RunInterop(test.test):
+
+  description = 'run interop test client/server'
+  user_options = [
+    ('args=', 'a', 'pass-thru arguments for the client/server'),
+    ('client', 'c', 'flag indicating to run the client'),
+    ('server', 's', 'flag indicating to run the server')
+  ]
+
+  def initialize_options(self):
+    self.args = ''
+    self.client = False
+    self.server = False
+
+  def finalize_options(self):
+    if self.client and self.server:
+      raise DistutilsOptionError('you may only specify one of client or server')
+
+  def run(self):
+    if self.distribution.install_requires:
+      self.distribution.fetch_build_eggs(self.distribution.install_requires)
+    if self.distribution.tests_require:
+      self.distribution.fetch_build_eggs(self.distribution.tests_require)
+    if self.client:
+      self.run_client()
+    elif self.server:
+      self.run_server()
+
+  def run_server(self):
+    # We import here to ensure that our setuptools parent has had a chance to
+    # edit the Python system path.
+    from tests.interop import server
+    sys.argv[1:] = self.args.split()
+    server.serve()
+
+  def run_client(self):
+    # We import here to ensure that our setuptools parent has had a chance to
+    # edit the Python system path.
+    from tests.interop import client
+    sys.argv[1:] = self.args.split()
+    client.test_interoperability()
diff --git a/src/python/grpcio/requirements.txt b/src/python/grpcio/requirements.txt
index ee8568120b..06516ee0d7 100644
--- a/src/python/grpcio/requirements.txt
+++ b/src/python/grpcio/requirements.txt
@@ -1,3 +1,4 @@
 enum34>=1.0.4
 futures>=2.2.0
 cython>=0.23
+coverage>=4.0
diff --git a/src/python/grpcio/setup.cfg b/src/python/grpcio/setup.cfg
index 8f69613632..52b6b50900 100644
--- a/src/python/grpcio/setup.cfg
+++ b/src/python/grpcio/setup.cfg
@@ -1,2 +1,8 @@
+[coverage:run]
+plugins = Cython.Coverage
+
 [build_ext]
 inplace=1
+
+[build_proto_modules]
+exclude=.*protoc_plugin/protoc_plugin_test\.proto$
diff --git a/src/python/grpcio/setup.py b/src/python/grpcio/setup.py
index ec68eb6755..8ac185bd6b 100644
--- a/src/python/grpcio/setup.py
+++ b/src/python/grpcio/setup.py
@@ -43,12 +43,21 @@ os.chdir(os.path.dirname(os.path.abspath(__file__)))
 # Break import-style to ensure we can actually find our commands module.
 import commands
 
-# Use environment variables to determine whether or not the Cython extension
-# should *use* Cython or use the generated C files. Note that this requires the
-# C files to have been generated by building first *with* Cython support.
-_BUILD_WITH_CYTHON = os.environ.get('GRPC_PYTHON_BUILD_WITH_CYTHON', False)
+# Environment variable to determine whether or not the Cython extension should
+# *use* Cython or use the generated C files. Note that this requires the C files
+# to have been generated by building first *with* Cython support.
+BUILD_WITH_CYTHON = os.environ.get('GRPC_PYTHON_BUILD_WITH_CYTHON', False)
 
-_C_EXTENSION_SOURCES = (
+# Environment variable to determine whether or not to enable coverage analysis
+# in Cython modules.
+ENABLE_CYTHON_TRACING = os.environ.get(
+    'GRPC_PYTHON_ENABLE_CYTHON_TRACING', False)
+
+# Environment variable to determine whether or not to include the test files in
+# the installation.
+INSTALL_TESTS = os.environ.get('GRPC_PYTHON_INSTALL_TESTS', False)
+
+C_EXTENSION_SOURCES = (
     'grpc/_adapter/_c/module.c',
     'grpc/_adapter/_c/types.c',
     'grpc/_adapter/_c/utility.c',
@@ -61,9 +70,9 @@ _C_EXTENSION_SOURCES = (
     'grpc/_adapter/_c/types/server.c',
 )
 
-_CYTHON_EXTENSION_PACKAGE_NAMES = ()
+CYTHON_EXTENSION_PACKAGE_NAMES = ()
 
-_CYTHON_EXTENSION_MODULE_NAMES = (
+CYTHON_EXTENSION_MODULE_NAMES = (
     'grpc._cython.cygrpc',
     'grpc._cython._cygrpc.call',
     'grpc._cython._cygrpc.channel',
@@ -73,24 +82,24 @@ _CYTHON_EXTENSION_MODULE_NAMES = (
     'grpc._cython._cygrpc.server',
 )
 
-_EXTENSION_INCLUDE_DIRECTORIES = (
+EXTENSION_INCLUDE_DIRECTORIES = (
     '.',
 )
 
-_EXTENSION_LIBRARIES = (
+EXTENSION_LIBRARIES = (
     'grpc',
     'gpr',
 )
 if not "darwin" in sys.platform:
-    _EXTENSION_LIBRARIES += ('rt',)
+    EXTENSION_LIBRARIES += ('rt',)
 
 
-_C_EXTENSION_MODULE = _core.Extension(
-    'grpc._adapter._c', sources=list(_C_EXTENSION_SOURCES),
-    include_dirs=list(_EXTENSION_INCLUDE_DIRECTORIES),
-    libraries=list(_EXTENSION_LIBRARIES),
+C_EXTENSION_MODULE = _core.Extension(
+    'grpc._adapter._c', sources=list(C_EXTENSION_SOURCES),
+    include_dirs=list(EXTENSION_INCLUDE_DIRECTORIES),
+    libraries=list(EXTENSION_LIBRARIES)
 )
-_EXTENSION_MODULES = [_C_EXTENSION_MODULE]
+EXTENSION_MODULES = [C_EXTENSION_MODULE]
 
 
 def cython_extensions(package_names, module_names, include_dirs, libraries,
@@ -101,48 +110,89 @@ def cython_extensions(package_names, module_names, include_dirs, libraries,
   extensions = [
       _extension.Extension(
           name=module_name, sources=[module_file],
-          include_dirs=include_dirs, libraries=libraries
+          include_dirs=include_dirs, libraries=libraries,
+          define_macros=[('CYTHON_TRACE_NOGIL', 1)] if ENABLE_CYTHON_TRACING else []
       ) for (module_name, module_file) in zip(module_names, module_files)
   ]
   if build_with_cython:
     import Cython.Build
-    return Cython.Build.cythonize(extensions)
+    return Cython.Build.cythonize(
+        extensions,
+        compiler_directives={'linetrace': bool(ENABLE_CYTHON_TRACING)})
   else:
     return extensions
 
-_CYTHON_EXTENSION_MODULES = cython_extensions(
-    list(_CYTHON_EXTENSION_PACKAGE_NAMES), list(_CYTHON_EXTENSION_MODULE_NAMES),
-    list(_EXTENSION_INCLUDE_DIRECTORIES), list(_EXTENSION_LIBRARIES),
-    bool(_BUILD_WITH_CYTHON))
+CYTHON_EXTENSION_MODULES = cython_extensions(
+    list(CYTHON_EXTENSION_PACKAGE_NAMES), list(CYTHON_EXTENSION_MODULE_NAMES),
+    list(EXTENSION_INCLUDE_DIRECTORIES), list(EXTENSION_LIBRARIES),
+    bool(BUILD_WITH_CYTHON))
 
-_PACKAGES = setuptools.find_packages('.')
-
-_PACKAGE_DIRECTORIES = {
+PACKAGE_DIRECTORIES = {
     '': '.',
 }
 
-_INSTALL_REQUIRES = (
+INSTALL_REQUIRES = (
     'enum34>=1.0.4',
     'futures>=2.2.0',
 )
 
-_SETUP_REQUIRES = (
+SETUP_REQUIRES = (
     'sphinx>=1.3',
-) + _INSTALL_REQUIRES
+) + INSTALL_REQUIRES
 
-_COMMAND_CLASS = {
+COMMAND_CLASS = {
     'doc': commands.SphinxDocumentation,
+    'build_proto_modules': commands.BuildProtoModules,
     'build_project_metadata': commands.BuildProjectMetadata,
     'build_py': commands.BuildPy,
+    'gather': commands.Gather,
+    'run_interop': commands.RunInterop,
+}
+
+TEST_PACKAGE_DATA = {
+    'tests.interop': [
+        'credentials/ca.pem',
+        'credentials/server1.key',
+        'credentials/server1.pem',
+    ],
+    'tests.protoc_plugin': [
+        'protoc_plugin_test.proto',
+    ],
+    'tests.unit': [
+        'credentials/ca.pem',
+        'credentials/server1.key',
+        'credentials/server1.pem',
+    ],
 }
 
+TESTS_REQUIRE = (
+    'oauth2client>=1.4.7',
+    'protobuf==3.0.0a3',
+    'coverage>=4.0',
+) + INSTALL_REQUIRES
+
+TEST_SUITE = 'tests'
+TEST_LOADER = 'tests:Loader'
+TEST_RUNNER = 'tests:Runner'
+
+PACKAGE_DATA = {}
+if INSTALL_TESTS:
+  PACKAGE_DATA = dict(PACKAGE_DATA, **TEST_PACKAGE_DATA)
+  PACKAGES = setuptools.find_packages('.')
+else:
+  PACKAGES = setuptools.find_packages('.', exclude=['tests', 'tests.*'])
+
 setuptools.setup(
     name='grpcio',
-    version='0.11.0b1',
-    ext_modules=_EXTENSION_MODULES + _CYTHON_EXTENSION_MODULES,
-    packages=list(_PACKAGES),
-    package_dir=_PACKAGE_DIRECTORIES,
-    install_requires=_INSTALL_REQUIRES,
-    setup_requires=_SETUP_REQUIRES,
-    cmdclass=_COMMAND_CLASS
+    version='0.11.0b2',
+    ext_modules=EXTENSION_MODULES + CYTHON_EXTENSION_MODULES,
+    packages=list(PACKAGES),
+    package_dir=PACKAGE_DIRECTORIES,
+    install_requires=INSTALL_REQUIRES,
+    setup_requires=SETUP_REQUIRES,
+    cmdclass=COMMAND_CLASS,
+    tests_require=TESTS_REQUIRE,
+    test_suite=TEST_SUITE,
+    test_loader=TEST_LOADER,
+    test_runner=TEST_RUNNER,
 )
diff --git a/src/python/grpcio_test/setup.py b/src/python/grpcio/tests/__init__.py
index e9ee45a92a..b76b3985a1 100644
--- a/src/python/grpcio_test/setup.py
+++ b/src/python/grpcio/tests/__init__.py
@@ -27,68 +27,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-"""A setup module for the GRPC Python interop testing package."""
+from tests import _loader
+from tests import _runner
 
-import os
-import os.path
-
-import setuptools
-
-# Ensure we're in the proper directory whether or not we're being used by pip.
-os.chdir(os.path.dirname(os.path.abspath(__file__)))
-
-# Break import-style to ensure we can actually find our commands module.
-import commands
-
-_PACKAGES = setuptools.find_packages('.')
-
-_PACKAGE_DIRECTORIES = {
-    '': '.',
-}
-
-_PACKAGE_DATA = {
-    'grpc_interop': [
-        'credentials/ca.pem',
-        'credentials/server1.key',
-        'credentials/server1.pem',
-    ],
-    'grpc_protoc_plugin': [
-        'test.proto',
-    ],
-    'grpc_test': [
-        'credentials/ca.pem',
-        'credentials/server1.key',
-        'credentials/server1.pem',
-    ],
-}
-
-_SETUP_REQUIRES = (
-    'pytest>=2.6',
-    'pytest-cov>=2.0',
-    'pytest-xdist>=1.11',
-    'pytest-timeout>=0.5',
-)
-
-_INSTALL_REQUIRES = (
-    'oauth2client>=1.4.7',
-    'grpcio>=0.11.0b0',
-    # TODO(issue 3321): Unpin protobuf dependency.
-    'protobuf==3.0.0a3',
-)
-
-_COMMAND_CLASS = {
-    'test': commands.RunTests,
-    'build_proto_modules': commands.BuildProtoModules,
-    'build_py': commands.BuildPy,
-}
-
-setuptools.setup(
-    name='grpcio_test',
-    version='0.11.0b0',
-    packages=_PACKAGES,
-    package_dir=_PACKAGE_DIRECTORIES,
-    package_data=_PACKAGE_DATA,
-    install_requires=_INSTALL_REQUIRES + _SETUP_REQUIRES,
-    setup_requires=_SETUP_REQUIRES,
-    cmdclass=_COMMAND_CLASS,
-)
+Loader = _loader.Loader
+Runner = _runner.Runner
diff --git a/src/python/grpcio/tests/_loader.py b/src/python/grpcio/tests/_loader.py
new file mode 100644
index 0000000000..14b22b0846
--- /dev/null
+++ b/src/python/grpcio/tests/_loader.py
@@ -0,0 +1,127 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import importlib
+import pkgutil
+import re
+import unittest
+
+import coverage
+
+# Some global spooky-action-at-a-distance hackery to get around
+# system-installation issues where the google namespace is defaulted to the
+# system even though the egg is higher priority on sys.path. This inverts the
+# path priority on package module paths thus giving any installed eggs higher
+# priority and having little effect otherwise.
+import google
+google.__path__.reverse()
+
+TEST_MODULE_REGEX = r'^.*_test$'
+
+
+class Loader(object):
+  """Test loader for setuptools test suite support.
+
+  Attributes:
+    suite (unittest.TestSuite): All tests collected by the loader.
+    loader (unittest.TestLoader): Standard Python unittest loader to be ran per
+      module discovered.
+    module_matcher (re.RegexObject): A regular expression object to match
+      against module names and determine whether or not the discovered module
+      contributes to the test suite.
+  """
+
+  def __init__(self):
+    self.suite = unittest.TestSuite()
+    self.loader = unittest.TestLoader()
+    self.module_matcher = re.compile(TEST_MODULE_REGEX)
+
+  def loadTestsFromNames(self, names, module=None):
+    """Function mirroring TestLoader::loadTestsFromNames, as expected by
+    setuptools.setup argument `test_loader`."""
+    # ensure that we capture decorators and definitions (else our coverage
+    # measure unnecessarily suffers)
+    coverage_context = coverage.Coverage(data_suffix=True)
+    coverage_context.start()
+    modules = [importlib.import_module(name) for name in names]
+    for module in modules:
+      self.visit_module(module)
+    for module in modules:
+      try:
+        package_paths = module.__path__
+      except:
+        continue
+      self.walk_packages(package_paths)
+    coverage_context.stop()
+    coverage_context.save()
+    return self.suite
+
+  def walk_packages(self, package_paths):
+    """Walks over the packages, dispatching `visit_module` calls.
+
+    Args:
+      package_paths (list): A list of paths over which to walk through modules
+        along.
+    """
+    for importer, module_name, is_package in (
+        pkgutil.iter_modules(package_paths)):
+      module = importer.find_module(module_name).load_module(module_name)
+      self.visit_module(module)
+      if is_package:
+        self.walk_packages(module.__path__)
+
+  def visit_module(self, module):
+    """Visits the module, adding discovered tests to the test suite.
+
+    Args:
+      module (module): Module to match against self.module_matcher; if matched
+        it has its tests loaded via self.loader into self.suite.
+    """
+    if self.module_matcher.match(module.__name__):
+      module_suite = self.loader.loadTestsFromModule(module)
+      self.suite.addTest(module_suite)
+
+
+def iterate_suite_cases(suite):
+  """Generator over all unittest.TestCases in a unittest.TestSuite.
+
+  Args:
+    suite (unittest.TestSuite): Suite to iterate over in the generator.
+
+  Returns:
+    generator: A generator over all unittest.TestCases in `suite`.
+  """
+  for item in suite:
+    if isinstance(item, unittest.TestSuite):
+      for child_item in iterate_suite_cases(item):
+        yield child_item
+    elif isinstance(item, unittest.TestCase):
+      yield item
+    else:
+      raise ValueError('unexpected suite item of type {}'.format(type(item)))
diff --git a/src/python/grpcio/tests/_result.py b/src/python/grpcio/tests/_result.py
new file mode 100644
index 0000000000..5a570f4279
--- /dev/null
+++ b/src/python/grpcio/tests/_result.py
@@ -0,0 +1,451 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import cStringIO as StringIO
+import collections
+import itertools
+import traceback
+import unittest
+from xml.etree import ElementTree
+
+import coverage
+
+from tests import _loader
+
+
+class CaseResult(collections.namedtuple('CaseResult', [
+    'id', 'name', 'kind', 'stdout', 'stderr', 'skip_reason', 'traceback'])):
+  """A serializable result of a single test case.
+
+  Attributes:
+    id (object): Any serializable object used to denote the identity of this
+      test case.
+    name (str or None): A human-readable name of the test case.
+    kind (CaseResult.Kind): The kind of test result.
+    stdout (object or None): Output on stdout, or None if nothing was captured.
+    stderr (object or None): Output on stderr, or None if nothing was captured.
+    skip_reason (object or None): The reason the test was skipped. Must be
+      something if self.kind is CaseResult.Kind.SKIP, else None.
+    traceback (object or None): The traceback of the test. Must be something if
+      self.kind is CaseResult.Kind.{ERROR, FAILURE, EXPECTED_FAILURE}, else
+      None.
+  """
+
+  class Kind:
+    UNTESTED = 'untested'
+    RUNNING = 'running'
+    ERROR = 'error'
+    FAILURE = 'failure'
+    SUCCESS = 'success'
+    SKIP = 'skip'
+    EXPECTED_FAILURE = 'expected failure'
+    UNEXPECTED_SUCCESS = 'unexpected success'
+
+  def __new__(cls, id=None, name=None, kind=None, stdout=None, stderr=None,
+              skip_reason=None, traceback=None):
+    """Helper keyword constructor for the namedtuple.
+
+    See this class' attributes for information on the arguments."""
+    assert id is not None
+    assert name is None or isinstance(name, str)
+    if kind is CaseResult.Kind.UNTESTED:
+      pass
+    elif kind is CaseResult.Kind.RUNNING:
+      pass
+    elif kind is CaseResult.Kind.ERROR:
+      assert traceback is not None
+    elif kind is CaseResult.Kind.FAILURE:
+      assert traceback is not None
+    elif kind is CaseResult.Kind.SUCCESS:
+      pass
+    elif kind is CaseResult.Kind.SKIP:
+      assert skip_reason is not None
+    elif kind is CaseResult.Kind.EXPECTED_FAILURE:
+      assert traceback is not None
+    elif kind is CaseResult.Kind.UNEXPECTED_SUCCESS:
+      pass
+    else:
+      assert False
+    return super(cls, CaseResult).__new__(
+        cls, id, name, kind, stdout, stderr, skip_reason, traceback)
+
+  def updated(self, name=None, kind=None, stdout=None, stderr=None,
+              skip_reason=None, traceback=None):
+    """Get a new validated CaseResult with the fields updated.
+
+    See this class' attributes for information on the arguments."""
+    name = self.name if name is None else name
+    kind = self.kind if kind is None else kind
+    stdout = self.stdout if stdout is None else stdout
+    stderr = self.stderr if stderr is None else stderr
+    skip_reason = self.skip_reason if skip_reason is None else skip_reason
+    traceback = self.traceback if traceback is None else traceback
+    return CaseResult(id=self.id, name=name, kind=kind, stdout=stdout,
+                      stderr=stderr, skip_reason=skip_reason,
+                      traceback=traceback)
+
+
+class AugmentedResult(unittest.TestResult):
+  """unittest.Result that keeps track of additional information.
+
+  Uses CaseResult objects to store test-case results, providing additional
+  information beyond that of the standard Python unittest library, such as
+  standard output.
+
+  Attributes:
+    id_map (callable): A unary callable mapping unittest.TestCase objects to
+      unique identifiers.
+    cases (dict): A dictionary mapping from the identifiers returned by id_map
+      to CaseResult objects corresponding to those IDs.
+  """
+
+  def __init__(self, id_map):
+    """Initialize the object with an identifier mapping.
+
+    Arguments:
+      id_map (callable): Corresponds to the attribute `id_map`."""
+    super(AugmentedResult, self).__init__()
+    self.id_map = id_map
+    self.cases = None
+
+  def startTestRun(self):
+    """See unittest.TestResult.startTestRun."""
+    super(AugmentedResult, self).startTestRun()
+    self.cases = dict()
+
+  def stopTestRun(self):
+    """See unittest.TestResult.stopTestRun."""
+    super(AugmentedResult, self).stopTestRun()
+
+  def startTest(self, test):
+    """See unittest.TestResult.startTest."""
+    super(AugmentedResult, self).startTest(test)
+    case_id = self.id_map(test)
+    self.cases[case_id] = CaseResult(
+        id=case_id, name=test.id(), kind=CaseResult.Kind.RUNNING)
+
+  def addError(self, test, error):
+    """See unittest.TestResult.addError."""
+    super(AugmentedResult, self).addError(test, error)
+    case_id = self.id_map(test)
+    self.cases[case_id] = self.cases[case_id].updated(
+        kind=CaseResult.Kind.ERROR, traceback=error)
+
+  def addFailure(self, test, error):
+    """See unittest.TestResult.addFailure."""
+    super(AugmentedResult, self).addFailure(test, error)
+    case_id = self.id_map(test)
+    self.cases[case_id] = self.cases[case_id].updated(
+        kind=CaseResult.Kind.FAILURE, traceback=error)
+
+  def addSuccess(self, test):
+    """See unittest.TestResult.addSuccess."""
+    super(AugmentedResult, self).addSuccess(test)
+    case_id = self.id_map(test)
+    self.cases[case_id] = self.cases[case_id].updated(
+        kind=CaseResult.Kind.SUCCESS)
+
+  def addSkip(self, test, reason):
+    """See unittest.TestResult.addSkip."""
+    super(AugmentedResult, self).addSkip(test, reason)
+    case_id = self.id_map(test)
+    self.cases[case_id] = self.cases[case_id].updated(
+        kind=CaseResult.Kind.SKIP, skip_reason=reason)
+
+  def addExpectedFailure(self, test, error):
+    """See unittest.TestResult.addExpectedFailure."""
+    super(AugmentedResult, self).addExpectedFailure(test, error)
+    case_id = self.id_map(test)
+    self.cases[case_id] = self.cases[case_id].updated(
+        kind=CaseResult.Kind.EXPECTED_FAILURE, traceback=error)
+
+  def addUnexpectedSuccess(self, test):
+    """See unittest.TestResult.addUnexpectedSuccess."""
+    super(AugmentedResult, self).addUnexpectedSuccess(test)
+    case_id = self.id_map(test)
+    self.cases[case_id] = self.cases[case_id].updated(
+        kind=CaseResult.Kind.UNEXPECTED_SUCCESS)
+
+  def set_output(self, test, stdout, stderr):
+    """Set the output attributes for the CaseResult corresponding to a test.
+
+    Args:
+      test (unittest.TestCase): The TestCase to set the outputs of.
+      stdout (str): Output from stdout to assign to self.id_map(test).
+      stderr (str): Output from stderr to assign to self.id_map(test).
+    """
+    case_id = self.id_map(test)
+    self.cases[case_id] = self.cases[case_id].updated(
+        stdout=stdout, stderr=stderr)
+
+  def augmented_results(self, filter):
+    """Convenience method to retrieve filtered case results.
+
+    Args:
+      filter (callable): A unary predicate to filter over CaseResult objects.
+    """
+    return (self.cases[case_id] for case_id in self.cases
+            if filter(self.cases[case_id]))
+
+
+class CoverageResult(AugmentedResult):
+  """Extension to AugmentedResult adding coverage.py support per test.\
+
+  Attributes:
+    coverage_context (coverage.Coverage): coverage.py management object.
+  """
+
+  def __init__(self, id_map):
+    """See AugmentedResult.__init__."""
+    super(CoverageResult, self).__init__(id_map=id_map)
+    self.coverage_context = None
+
+  def startTest(self, test):
+    """See unittest.TestResult.startTest.
+
+    Additionally initializes and begins code coverage tracking."""
+    super(CoverageResult, self).startTest(test)
+    self.coverage_context = coverage.Coverage(data_suffix=True)
+    self.coverage_context.start()
+
+  def stopTest(self, test):
+    """See unittest.TestResult.stopTest.
+
+    Additionally stops and deinitializes code coverage tracking."""
+    super(CoverageResult, self).stopTest(test)
+    self.coverage_context.stop()
+    self.coverage_context.save()
+    self.coverage_context = None
+
+  def stopTestRun(self):
+    """See unittest.TestResult.stopTestRun."""
+    super(CoverageResult, self).stopTestRun()
+    # TODO(atash): Dig deeper into why the following line fails to properly
+    # combine coverage data from the Cython plugin.
+    #coverage.Coverage().combine()
+
+
+class _Colors:
+  """Namespaced constants for terminal color magic numbers."""
+  HEADER = '\033[95m'
+  INFO = '\033[94m'
+  OK = '\033[92m'
+  WARN = '\033[93m'
+  FAIL = '\033[91m'
+  BOLD = '\033[1m'
+  UNDERLINE = '\033[4m'
+  END = '\033[0m'
+
+
+class TerminalResult(CoverageResult):
+  """Extension to CoverageResult adding basic terminal reporting."""
+
+  def __init__(self, out, id_map):
+    """Initialize the result object.
+
+    Args:
+      out (file-like): Output file to which terminal-colored live results will
+        be written.
+      id_map (callable): See AugmentedResult.__init__.
+    """
+    super(TerminalResult, self).__init__(id_map=id_map)
+    self.out = out
+
+  def startTestRun(self):
+    """See unittest.TestResult.startTestRun."""
+    super(TerminalResult, self).startTestRun()
+    self.out.write(
+        _Colors.HEADER +
+        'Testing gRPC Python...\n' +
+        _Colors.END)
+
+  def stopTestRun(self):
+    """See unittest.TestResult.stopTestRun."""
+    super(TerminalResult, self).stopTestRun()
+    self.out.write(summary(self))
+    self.out.flush()
+
+  def addError(self, test, error):
+    """See unittest.TestResult.addError."""
+    super(TerminalResult, self).addError(test, error)
+    self.out.write(
+        _Colors.FAIL +
+        'ERROR         {}\n'.format(test.id()) +
+        _Colors.END)
+    self.out.flush()
+
+  def addFailure(self, test, error):
+    """See unittest.TestResult.addFailure."""
+    super(TerminalResult, self).addFailure(test, error)
+    self.out.write(
+        _Colors.FAIL +
+        'FAILURE       {}\n'.format(test.id()) +
+        _Colors.END)
+    self.out.flush()
+
+  def addSuccess(self, test):
+    """See unittest.TestResult.addSuccess."""
+    super(TerminalResult, self).addSuccess(test)
+    self.out.write(
+        _Colors.OK +
+        'SUCCESS       {}\n'.format(test.id()) +
+        _Colors.END)
+    self.out.flush()
+
+  def addSkip(self, test, reason):
+    """See unittest.TestResult.addSkip."""
+    super(TerminalResult, self).addSkip(test, reason)
+    self.out.write(
+        _Colors.INFO +
+        'SKIP          {}\n'.format(test.id()) +
+        _Colors.END)
+    self.out.flush()
+
+  def addExpectedFailure(self, test, error):
+    """See unittest.TestResult.addExpectedFailure."""
+    super(TerminalResult, self).addExpectedFailure(test, error)
+    self.out.write(
+        _Colors.INFO +
+        'FAILURE_OK    {}\n'.format(test.id()) +
+        _Colors.END)
+    self.out.flush()
+
+  def addUnexpectedSuccess(self, test):
+    """See unittest.TestResult.addUnexpectedSuccess."""
+    super(TerminalResult, self).addUnexpectedSuccess(test)
+    self.out.write(
+        _Colors.INFO +
+        'UNEXPECTED_OK {}\n'.format(test.id()) +
+        _Colors.END)
+    self.out.flush()
+
+def _traceback_string(type, value, trace):
+  """Generate a descriptive string of a Python exception traceback.
+
+  Args:
+    type (class): The type of the exception.
+    value (Exception): The value of the exception.
+    trace (traceback): Traceback of the exception.
+
+  Returns:
+    str: Formatted exception descriptive string.
+  """
+  buffer = StringIO.StringIO()
+  traceback.print_exception(type, value, trace, file=buffer)
+  return buffer.getvalue()
+
+def summary(result):
+  """A summary string of a result object.
+
+  Args:
+    result (AugmentedResult): The result object to get the summary of.
+
+  Returns:
+    str: The summary string.
+  """
+  assert isinstance(result, AugmentedResult)
+  untested = list(result.augmented_results(
+      lambda case_result: case_result.kind is CaseResult.Kind.UNTESTED))
+  running = list(result.augmented_results(
+      lambda case_result: case_result.kind is CaseResult.Kind.RUNNING))
+  failures = list(result.augmented_results(
+      lambda case_result: case_result.kind is CaseResult.Kind.FAILURE))
+  errors = list(result.augmented_results(
+      lambda case_result: case_result.kind is CaseResult.Kind.ERROR))
+  successes = list(result.augmented_results(
+      lambda case_result: case_result.kind is CaseResult.Kind.SUCCESS))
+  skips = list(result.augmented_results(
+      lambda case_result: case_result.kind is CaseResult.Kind.SKIP))
+  expected_failures = list(result.augmented_results(
+      lambda case_result: case_result.kind is CaseResult.Kind.EXPECTED_FAILURE))
+  unexpected_successes = list(result.augmented_results(
+      lambda case_result: case_result.kind is CaseResult.Kind.UNEXPECTED_SUCCESS))
+  running_names = [case.name for case in running]
+  finished_count = (len(failures) + len(errors) + len(successes) +
+                    len(expected_failures) + len(unexpected_successes))
+  statistics = (
+      '{finished} tests finished:\n'
+      '\t{successful} successful\n'
+      '\t{unsuccessful} unsuccessful\n'
+      '\t{skipped} skipped\n'
+      '\t{expected_fail} expected failures\n'
+      '\t{unexpected_successful} unexpected successes\n'
+      'Interrupted Tests:\n'
+      '\t{interrupted}\n'
+      .format(finished=finished_count,
+              successful=len(successes),
+              unsuccessful=(len(failures)+len(errors)),
+              skipped=len(skips),
+              expected_fail=len(expected_failures),
+              unexpected_successful=len(unexpected_successes),
+              interrupted=str(running_names)))
+  tracebacks = '\n\n'.join([
+      (_Colors.FAIL + '{test_name}' + _Colors.END + + '\n' +
+       _Colors.BOLD + 'traceback:' + _Colors.END + '\n' +
+       '{traceback}\n' +
+       _Colors.BOLD + 'stdout:' + _Colors.END + '\n' +
+       '{stdout}\n' +
+       _Colors.BOLD + 'stderr:' + _Colors.END + '\n' +
+       '{stderr}\n').format(
+           test_name=result.name,
+           traceback=_traceback_string(*result.traceback),
+           stdout=result.stdout, stderr=result.stderr)
+      for result in itertools.chain(failures, errors)
+  ])
+  notes = 'Unexpected successes: {}\n'.format([
+      result.name for result in unexpected_successes])
+  return statistics + '\nErrors/Failures: \n' + tracebacks + '\n' + notes
+
+
+def jenkins_junit_xml(result):
+  """An XML tree object that when written is recognizable by Jenkins.
+
+  Args:
+    result (AugmentedResult): The result object to get the junit xml output of.
+
+  Returns:
+    ElementTree.ElementTree: The XML tree.
+  """
+  assert isinstance(result, AugmentedResult)
+  root = ElementTree.Element('testsuites')
+  suite = ElementTree.SubElement(root, 'testsuite', {
+      'name': 'Python gRPC tests',
+  })
+  for case in result.cases.values():
+    if case.kind is CaseResult.Kind.SUCCESS:
+      ElementTree.SubElement(suite, 'testcase', {
+          'name': case.name,
+      })
+    elif case.kind in (CaseResult.Kind.ERROR, CaseResult.Kind.FAILURE):
+      case_xml = ElementTree.SubElement(suite, 'testcase', {
+          'name': case.name,
+      })
+      error_xml = ElementTree.SubElement(case_xml, 'error', {})
+      error_xml.text = ''.format(case.stderr, case.traceback)
+  return ElementTree.ElementTree(element=root)
diff --git a/src/python/grpcio/tests/_runner.py b/src/python/grpcio/tests/_runner.py
new file mode 100644
index 0000000000..4f1ddb57fc
--- /dev/null
+++ b/src/python/grpcio/tests/_runner.py
@@ -0,0 +1,224 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import cStringIO as StringIO
+import collections
+import fcntl
+import multiprocessing
+import os
+import select
+import signal
+import sys
+import threading
+import time
+import unittest
+import uuid
+
+from tests import _loader
+from tests import _result
+
+
+class CapturePipe(object):
+  """A context-manager pipe to redirect output to a byte array.
+
+  Attributes:
+    _redirect_fd (int): File descriptor of file to redirect writes from.
+    _saved_fd (int): A copy of the original value of the redirected file
+      descriptor.
+    _read_thread (threading.Thread or None): Thread upon which reads through the
+      pipe are performed. Only non-None when self is started.
+    _read_fd (int or None): File descriptor of the read end of the redirect
+      pipe. Only non-None when self is started.
+    _write_fd (int or None): File descriptor of the write end of the redirect
+      pipe. Only non-None when self is started.
+    output (bytearray or None): Redirected output from writes to the redirected
+      file descriptor. Only valid during and after self has started.
+  """
+
+  def __init__(self, fd):
+    self._redirect_fd = fd
+    self._saved_fd = os.dup(self._redirect_fd)
+    self._read_thread = None
+    self._read_fd = None
+    self._write_fd = None
+    self.output = None
+
+  def start(self):
+    """Start redirection of writes to the file descriptor."""
+    self._read_fd, self._write_fd = os.pipe()
+    os.dup2(self._write_fd, self._redirect_fd)
+    flags = fcntl.fcntl(self._read_fd, fcntl.F_GETFL)
+    fcntl.fcntl(self._read_fd, fcntl.F_SETFL, flags | os.O_NONBLOCK)
+    self._read_thread = threading.Thread(target=self._read)
+    self._read_thread.start()
+
+  def stop(self):
+    """Stop redirection of writes to the file descriptor."""
+    os.close(self._write_fd)
+    os.dup2(self._saved_fd, self._redirect_fd)  # auto-close self._redirect_fd
+    self._read_thread.join()
+    self._read_thread = None
+    # we waited for the read thread to finish, so _read_fd has been read and we
+    # can close it.
+    os.close(self._read_fd)
+
+  def _read(self):
+    """Read-thread target for self."""
+    self.output = bytearray()
+    while True:
+      select.select([self._read_fd], [], [])
+      read_bytes = os.read(self._read_fd, 1024)
+      if read_bytes:
+        self.output.extend(read_bytes)
+      else:
+        break
+
+  def write_bypass(self, value):
+    """Bypass the redirection and write directly to the original file.
+
+    Arguments:
+      value (str): What to write to the original file.
+    """
+    if self._saved_fd is None:
+      os.write(self._redirect_fd, value)
+    else:
+      os.write(self._saved_fd, value)
+
+  def __enter__(self):
+    self.start()
+    return self
+
+  def __exit__(self, type, value, traceback):
+    self.stop()
+
+  def close(self):
+    """Close any resources used by self not closed by stop()."""
+    os.close(self._saved_fd)
+
+
+class AugmentedCase(collections.namedtuple('AugmentedCase', [
+    'case', 'id'])):
+  """A test case with a guaranteed unique externally specified identifier.
+
+  Attributes:
+    case (unittest.TestCase): TestCase we're decorating with an additional
+      identifier.
+    id (object): Any identifier that may be considered 'unique' for testing
+      purposes.
+  """
+
+  def __new__(cls, case, id=None):
+    if id is None:
+      id = uuid.uuid4()
+    return super(cls, AugmentedCase).__new__(cls, case, id)
+
+
+class Runner(object):
+
+  def run(self, suite):
+    """See setuptools' test_runner setup argument for information."""
+    # Ensure that every test case has no collision with any other test case in
+    # the augmented results.
+    augmented_cases = [AugmentedCase(case, uuid.uuid4())
+                       for case in _loader.iterate_suite_cases(suite)]
+    case_id_by_case = dict((augmented_case.case, augmented_case.id)
+                           for augmented_case in augmented_cases)
+    result_out = StringIO.StringIO()
+    result = _result.TerminalResult(
+        result_out, id_map=lambda case: case_id_by_case[case])
+    stdout_pipe = CapturePipe(sys.stdout.fileno())
+    stderr_pipe = CapturePipe(sys.stderr.fileno())
+    kill_flag = [False]
+
+    def sigint_handler(signal_number, frame):
+      if signal_number == signal.SIGINT:
+        kill_flag[0] = True  # Python 2.7 not having 'local'... :-(
+      signal.signal(signal_number, signal.SIG_DFL)
+
+    def fault_handler(signal_number, frame):
+      stdout_pipe.write_bypass(
+          'Received fault signal {}\nstdout:\n{}\n\nstderr:{}\n'
+          .format(signal_number, stdout_pipe.output, stderr_pipe.output))
+      os._exit(1)
+
+    def check_kill_self():
+      if kill_flag[0]:
+        stdout_pipe.write_bypass('Stopping tests short...')
+        result.stopTestRun()
+        stdout_pipe.write_bypass(result_out.getvalue())
+        stdout_pipe.write_bypass(
+            '\ninterrupted stdout:\n{}\n'.format(stdout_pipe.output))
+        stderr_pipe.write_bypass(
+            '\ninterrupted stderr:\n{}\n'.format(stderr_pipe.output))
+        os._exit(1)
+    signal.signal(signal.SIGINT, sigint_handler)
+    signal.signal(signal.SIGSEGV, fault_handler)
+    signal.signal(signal.SIGBUS, fault_handler)
+    signal.signal(signal.SIGABRT, fault_handler)
+    signal.signal(signal.SIGFPE, fault_handler)
+    signal.signal(signal.SIGILL, fault_handler)
+    # Sometimes output will lag after a test has successfully finished; we
+    # ignore such writes to our pipes.
+    signal.signal(signal.SIGPIPE, signal.SIG_IGN)
+
+    # Run the tests
+    result.startTestRun()
+    for augmented_case in augmented_cases:
+      sys.stdout.write('Running       {}\n'.format(augmented_case.case.id()))
+      sys.stdout.flush()
+      case_thread = threading.Thread(
+          target=augmented_case.case.run, args=(result,))
+      try:
+        with stdout_pipe, stderr_pipe:
+          case_thread.start()
+          while case_thread.is_alive():
+            check_kill_self()
+            time.sleep(0)
+          case_thread.join()
+      except:
+        # re-raise the exception after forcing the with-block to end
+        raise
+      result.set_output(
+          augmented_case.case, stdout_pipe.output, stderr_pipe.output)
+      sys.stdout.write(result_out.getvalue())
+      sys.stdout.flush()
+      result_out.truncate(0)
+      check_kill_self()
+    result.stopTestRun()
+    stdout_pipe.close()
+    stderr_pipe.close()
+
+    # Report results
+    sys.stdout.write(result_out.getvalue())
+    sys.stdout.flush()
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
+    with open('report.xml', 'w') as report_xml_file:
+      _result.jenkins_junit_xml(result).write(report_xml_file)
+    return result
+
diff --git a/src/python/grpcio_test/grpc_interop/__init__.py b/src/python/grpcio/tests/interop/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_interop/__init__.py
+++ b/src/python/grpcio/tests/interop/__init__.py
diff --git a/src/python/grpcio_test/grpc_interop/_insecure_interop_test.py b/src/python/grpcio/tests/interop/_insecure_interop_test.py
index 5007be28ff..00b49aba37 100644
--- a/src/python/grpcio_test/grpc_interop/_insecure_interop_test.py
+++ b/src/python/grpcio/tests/interop/_insecure_interop_test.py
@@ -33,10 +33,10 @@ import unittest
 
 from grpc.beta import implementations
 
-from grpc_interop import _interop_test_case
-from grpc_interop import methods
-from grpc_interop import server
-from grpc_interop import test_pb2
+from tests.interop import _interop_test_case
+from tests.interop import methods
+from tests.interop import server
+from tests.interop import test_pb2
 
 
 class InsecureInteropTest(
diff --git a/src/python/grpcio_test/grpc_interop/_interop_test_case.py b/src/python/grpcio/tests/interop/_interop_test_case.py
index b6d06b300d..ccea17a66d 100644
--- a/src/python/grpcio_test/grpc_interop/_interop_test_case.py
+++ b/src/python/grpcio/tests/interop/_interop_test_case.py
@@ -29,7 +29,7 @@
 
 """Common code for unit tests of the interoperability test code."""
 
-from grpc_interop import methods
+from tests.interop import methods
 
 
 class InteropTestCase(object):
diff --git a/src/python/grpcio_test/grpc_interop/_secure_interop_test.py b/src/python/grpcio/tests/interop/_secure_interop_test.py
index 108e15b0f9..a0fef1fc20 100644
--- a/src/python/grpcio_test/grpc_interop/_secure_interop_test.py
+++ b/src/python/grpcio/tests/interop/_secure_interop_test.py
@@ -33,12 +33,12 @@ import unittest
 
 from grpc.beta import implementations
 
-from grpc_test.beta import test_utilities
+from tests.interop import _interop_test_case
+from tests.interop import methods
+from tests.interop import resources
+from tests.interop import test_pb2
 
-from grpc_interop import _interop_test_case
-from grpc_interop import methods
-from grpc_interop import resources
-from grpc_interop import test_pb2
+from tests.unit.beta import test_utilities
 
 _SERVER_HOST_OVERRIDE = 'foo.test.google.fr'
 
diff --git a/src/python/grpcio_test/grpc_interop/client.py b/src/python/grpcio/tests/interop/client.py
index b8d5047ca5..9449ff5429 100644
--- a/src/python/grpcio_test/grpc_interop/client.py
+++ b/src/python/grpcio/tests/interop/client.py
@@ -34,11 +34,10 @@ from oauth2client import client as oauth2client_client
 
 from grpc.beta import implementations
 
-from grpc_test.beta import test_utilities
-
-from grpc_interop import methods
-from grpc_interop import resources
-from grpc_interop import test_pb2
+from tests.interop import methods
+from tests.interop import resources
+from tests.interop import test_pb2
+from tests.unit.beta import test_utilities
 
 _ONE_DAY_IN_SECONDS = 60 * 60 * 24
 
@@ -114,7 +113,7 @@ def _test_case_from_arg(test_case_arg):
     raise ValueError('No test case "%s"!' % test_case_arg)
 
 
-def _test_interoperability():
+def test_interoperability():
   args = _args()
   stub = _stub(args)
   test_case = _test_case_from_arg(args.test_case)
@@ -122,4 +121,4 @@ def _test_interoperability():
 
 
 if __name__ == '__main__':
-  _test_interoperability()
+  test_interoperability()
diff --git a/src/python/grpcio_test/grpc_interop/credentials/README b/src/python/grpcio/tests/interop/credentials/README
index cb20dcb49f..cb20dcb49f 100644
--- a/src/python/grpcio_test/grpc_interop/credentials/README
+++ b/src/python/grpcio/tests/interop/credentials/README
diff --git a/src/python/grpcio_test/grpc_interop/credentials/ca.pem b/src/python/grpcio/tests/interop/credentials/ca.pem
index 6c8511a73c..6c8511a73c 100755
--- a/src/python/grpcio_test/grpc_interop/credentials/ca.pem
+++ b/src/python/grpcio/tests/interop/credentials/ca.pem
diff --git a/src/python/grpcio_test/grpc_interop/credentials/server1.key b/src/python/grpcio/tests/interop/credentials/server1.key
index 143a5b8765..143a5b8765 100755
--- a/src/python/grpcio_test/grpc_interop/credentials/server1.key
+++ b/src/python/grpcio/tests/interop/credentials/server1.key
diff --git a/src/python/grpcio_test/grpc_interop/credentials/server1.pem b/src/python/grpcio/tests/interop/credentials/server1.pem
index f3d43fcc5b..f3d43fcc5b 100755
--- a/src/python/grpcio_test/grpc_interop/credentials/server1.pem
+++ b/src/python/grpcio/tests/interop/credentials/server1.pem
diff --git a/src/python/grpcio_test/grpc_interop/empty.proto b/src/python/grpcio/tests/interop/empty.proto
index 6d0eb937d6..6d0eb937d6 100644
--- a/src/python/grpcio_test/grpc_interop/empty.proto
+++ b/src/python/grpcio/tests/interop/empty.proto
diff --git a/src/python/grpcio_test/grpc_interop/messages.proto b/src/python/grpcio/tests/interop/messages.proto
index 193b6c4171..193b6c4171 100644
--- a/src/python/grpcio_test/grpc_interop/messages.proto
+++ b/src/python/grpcio/tests/interop/messages.proto
diff --git a/src/python/grpcio_test/grpc_interop/methods.py b/src/python/grpcio/tests/interop/methods.py
index 3ef8545355..b3591aef7b 100644
--- a/src/python/grpcio_test/grpc_interop/methods.py
+++ b/src/python/grpcio/tests/interop/methods.py
@@ -40,9 +40,9 @@ from oauth2client import client as oauth2client_client
 from grpc.framework.common import cardinality
 from grpc.framework.interfaces.face import face
 
-from grpc_interop import empty_pb2
-from grpc_interop import messages_pb2
-from grpc_interop import test_pb2
+from tests.interop import empty_pb2
+from tests.interop import messages_pb2
+from tests.interop import test_pb2
 
 _TIMEOUT = 7
 
diff --git a/src/python/grpcio_test/grpc_interop/resources.py b/src/python/grpcio/tests/interop/resources.py
index 1122499418..1122499418 100644
--- a/src/python/grpcio_test/grpc_interop/resources.py
+++ b/src/python/grpcio/tests/interop/resources.py
diff --git a/src/python/grpcio_test/grpc_interop/server.py b/src/python/grpcio/tests/interop/server.py
index b541087663..6dd55f008c 100644
--- a/src/python/grpcio_test/grpc_interop/server.py
+++ b/src/python/grpcio/tests/interop/server.py
@@ -35,9 +35,9 @@ import time
 
 from grpc.beta import implementations
 
-from grpc_interop import methods
-from grpc_interop import resources
-from grpc_interop import test_pb2
+from tests.interop import methods
+from tests.interop import resources
+from tests.interop import test_pb2
 
 _ONE_DAY_IN_SECONDS = 60 * 60 * 24
 
@@ -68,7 +68,7 @@ def serve():
       time.sleep(_ONE_DAY_IN_SECONDS)
   except BaseException as e:
     logging.info('Caught exception "%s"; stopping server...', e)
-    server.stop()
+    server.stop(0)
     logging.info('Server stopped; exiting.')
 
 if __name__ == '__main__':
diff --git a/src/python/grpcio_test/grpc_interop/test.proto b/src/python/grpcio/tests/interop/test.proto
index b499813e56..9feecc0278 100644
--- a/src/python/grpcio_test/grpc_interop/test.proto
+++ b/src/python/grpcio/tests/interop/test.proto
@@ -33,8 +33,8 @@
 
 syntax = "proto3";
 
-import "grpc_interop/empty.proto";
-import "grpc_interop/messages.proto";
+import "tests/interop/empty.proto";
+import "tests/interop/messages.proto";
 
 package grpc.testing;
 
diff --git a/src/python/grpcio_test/grpc_protoc_plugin/__init__.py b/src/python/grpcio/tests/protoc_plugin/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_protoc_plugin/__init__.py
+++ b/src/python/grpcio/tests/protoc_plugin/__init__.py
diff --git a/src/python/grpcio_test/grpc_protoc_plugin/beta_python_plugin_test.py b/src/python/grpcio/tests/protoc_plugin/beta_python_plugin_test.py
index 259b978de2..ba5b219a88 100644
--- a/src/python/grpcio_test/grpc_protoc_plugin/beta_python_plugin_test.py
+++ b/src/python/grpcio/tests/protoc_plugin/beta_python_plugin_test.py
@@ -45,7 +45,7 @@ import unittest
 from grpc.beta import implementations
 from grpc.framework.foundation import future
 from grpc.framework.interfaces.face import face
-from grpc_test.framework.common import test_constants
+from tests.unit.framework.common import test_constants
 
 # Identifiers of entities we expect to find in the generated module.
 SERVICER_IDENTIFIER = 'BetaTestServiceServicer'
@@ -218,7 +218,7 @@ class PythonPluginTest(unittest.TestCase):
     protoc_plugin_filename = distutils.spawn.find_executable(
         'grpc_python_plugin')
     test_proto_filename = pkg_resources.resource_filename(
-        'grpc_protoc_plugin', 'test.proto')
+        'tests.protoc_plugin', 'protoc_plugin_test.proto')
     if not os.path.isfile(protoc_command):
       # Assume that if we haven't built protoc that it's on the system.
       protoc_command = 'protoc'
@@ -237,7 +237,7 @@ class PythonPluginTest(unittest.TestCase):
     ]
     subprocess.check_call(' '.join(cmd), shell=True, env=os.environ,
                           cwd=os.path.dirname(test_proto_filename))
-    sys.path.append(self.outdir)
+    sys.path.insert(0, self.outdir)
 
   def tearDown(self):
     try:
@@ -245,22 +245,26 @@ class PythonPluginTest(unittest.TestCase):
     except OSError as exc:
       if exc.errno != errno.ENOENT:
         raise
+    sys.path.remove(self.outdir)
 
   def testImportAttributes(self):
     # check that we can access the generated module and its members.
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     self.assertIsNotNone(getattr(test_pb2, SERVICER_IDENTIFIER, None))
     self.assertIsNotNone(getattr(test_pb2, STUB_IDENTIFIER, None))
     self.assertIsNotNone(getattr(test_pb2, SERVER_FACTORY_IDENTIFIER, None))
     self.assertIsNotNone(getattr(test_pb2, STUB_FACTORY_IDENTIFIER, None))
 
   def testUpDown(self):
-    import test_pb2
+    import protoc_plugin_test_pb2 as test_pb2
+    reload(test_pb2)
     with _CreateService(test_pb2) as (servicer, stub):
       request = test_pb2.SimpleRequest(response_size=13)
 
   def testUnaryCall(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       request = test_pb2.SimpleRequest(response_size=13)
       response = stub.UnaryCall(request, test_constants.LONG_TIMEOUT)
@@ -268,7 +272,8 @@ class PythonPluginTest(unittest.TestCase):
     self.assertEqual(expected_response, response)
 
   def testUnaryCallFuture(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     request = test_pb2.SimpleRequest(response_size=13)
     with _CreateService(test_pb2) as (methods, stub):
       # Check that the call does not block waiting for the server to respond.
@@ -280,7 +285,8 @@ class PythonPluginTest(unittest.TestCase):
     self.assertEqual(expected_response, response)
 
   def testUnaryCallFutureExpired(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       request = test_pb2.SimpleRequest(response_size=13)
       with methods.pause():
@@ -290,7 +296,8 @@ class PythonPluginTest(unittest.TestCase):
           response_future.result()
 
   def testUnaryCallFutureCancelled(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     request = test_pb2.SimpleRequest(response_size=13)
     with _CreateService(test_pb2) as (methods, stub):
       with methods.pause():
@@ -299,7 +306,8 @@ class PythonPluginTest(unittest.TestCase):
         self.assertTrue(response_future.cancelled())
 
   def testUnaryCallFutureFailed(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     request = test_pb2.SimpleRequest(response_size=13)
     with _CreateService(test_pb2) as (methods, stub):
       with methods.fail():
@@ -308,7 +316,8 @@ class PythonPluginTest(unittest.TestCase):
         self.assertIsNotNone(response_future.exception())
 
   def testStreamingOutputCall(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     request = _streaming_output_request(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       responses = stub.StreamingOutputCall(
@@ -320,7 +329,8 @@ class PythonPluginTest(unittest.TestCase):
         self.assertEqual(expected_response, response)
 
   def testStreamingOutputCallExpired(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     request = _streaming_output_request(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       with methods.pause():
@@ -330,7 +340,8 @@ class PythonPluginTest(unittest.TestCase):
           list(responses)
 
   def testStreamingOutputCallCancelled(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     request = _streaming_output_request(test_pb2)
     with _CreateService(test_pb2) as (unused_methods, stub):
       responses = stub.StreamingOutputCall(
@@ -341,7 +352,8 @@ class PythonPluginTest(unittest.TestCase):
         next(responses)
 
   def testStreamingOutputCallFailed(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     request = _streaming_output_request(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       with methods.fail():
@@ -351,7 +363,8 @@ class PythonPluginTest(unittest.TestCase):
           next(responses)
 
   def testStreamingInputCall(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       response = stub.StreamingInputCall(
           _streaming_input_request_iterator(test_pb2),
@@ -361,7 +374,8 @@ class PythonPluginTest(unittest.TestCase):
     self.assertEqual(expected_response, response)
 
   def testStreamingInputCallFuture(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       with methods.pause():
         response_future = stub.StreamingInputCall.future(
@@ -373,7 +387,8 @@ class PythonPluginTest(unittest.TestCase):
     self.assertEqual(expected_response, response)
 
   def testStreamingInputCallFutureExpired(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       with methods.pause():
         response_future = stub.StreamingInputCall.future(
@@ -385,7 +400,8 @@ class PythonPluginTest(unittest.TestCase):
             response_future.exception(), face.ExpirationError)
 
   def testStreamingInputCallFutureCancelled(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       with methods.pause():
         response_future = stub.StreamingInputCall.future(
@@ -397,7 +413,8 @@ class PythonPluginTest(unittest.TestCase):
         response_future.result()
 
   def testStreamingInputCallFutureFailed(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       with methods.fail():
         response_future = stub.StreamingInputCall.future(
@@ -406,7 +423,8 @@ class PythonPluginTest(unittest.TestCase):
         self.assertIsNotNone(response_future.exception())
 
   def testFullDuplexCall(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       responses = stub.FullDuplexCall(
           _full_duplex_request_iterator(test_pb2), test_constants.LONG_TIMEOUT)
@@ -417,7 +435,8 @@ class PythonPluginTest(unittest.TestCase):
         self.assertEqual(expected_response, response)
 
   def testFullDuplexCallExpired(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     request_iterator = _full_duplex_request_iterator(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       with methods.pause():
@@ -427,7 +446,8 @@ class PythonPluginTest(unittest.TestCase):
           list(responses)
 
   def testFullDuplexCallCancelled(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       request_iterator = _full_duplex_request_iterator(test_pb2)
       responses = stub.FullDuplexCall(
@@ -438,7 +458,8 @@ class PythonPluginTest(unittest.TestCase):
         next(responses)
 
   def testFullDuplexCallFailed(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     request_iterator = _full_duplex_request_iterator(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       with methods.fail():
@@ -449,7 +470,8 @@ class PythonPluginTest(unittest.TestCase):
           next(responses)
 
   def testHalfDuplexCall(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     with _CreateService(test_pb2) as (methods, stub):
       def half_duplex_request_iterator():
         request = test_pb2.StreamingOutputCallRequest()
@@ -468,7 +490,8 @@ class PythonPluginTest(unittest.TestCase):
         self.assertEqual(expected_response, response)
 
   def testHalfDuplexCallWedged(self):
-    import test_pb2  # pylint: disable=g-import-not-at-top
+    import protoc_plugin_test_pb2 as test_pb2  # pylint: disable=g-import-not-at-top
+    reload(test_pb2)
     condition = threading.Condition()
     wait_cell = [False]
     @contextlib.contextmanager
diff --git a/src/python/grpcio_test/grpc_protoc_plugin/test.proto b/src/python/grpcio/tests/protoc_plugin/protoc_plugin_test.proto
index 6762a8e7f3..6762a8e7f3 100644
--- a/src/python/grpcio_test/grpc_protoc_plugin/test.proto
+++ b/src/python/grpcio/tests/protoc_plugin/protoc_plugin_test.proto
diff --git a/src/python/grpcio_test/grpc_test/__init__.py b/src/python/grpcio/tests/unit/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/__init__.py
+++ b/src/python/grpcio/tests/unit/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/_adapter/.gitignore b/src/python/grpcio/tests/unit/_adapter/.gitignore
index a6f96cd6db..a6f96cd6db 100644
--- a/src/python/grpcio_test/grpc_test/_adapter/.gitignore
+++ b/src/python/grpcio/tests/unit/_adapter/.gitignore
diff --git a/src/python/grpcio_test/grpc_test/_adapter/__init__.py b/src/python/grpcio/tests/unit/_adapter/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/_adapter/__init__.py
+++ b/src/python/grpcio/tests/unit/_adapter/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/_adapter/_c_test.py b/src/python/grpcio/tests/unit/_adapter/_c_test.py
index fe020e2a9c..fe020e2a9c 100644
--- a/src/python/grpcio_test/grpc_test/_adapter/_c_test.py
+++ b/src/python/grpcio/tests/unit/_adapter/_c_test.py
diff --git a/src/python/grpcio_test/grpc_test/_adapter/_intermediary_low_test.py b/src/python/grpcio/tests/unit/_adapter/_intermediary_low_test.py
index 90ad0b9bcb..90ad0b9bcb 100644
--- a/src/python/grpcio_test/grpc_test/_adapter/_intermediary_low_test.py
+++ b/src/python/grpcio/tests/unit/_adapter/_intermediary_low_test.py
diff --git a/src/python/grpcio_test/grpc_test/_adapter/_low_test.py b/src/python/grpcio/tests/unit/_adapter/_low_test.py
index 8115cd0e83..39b6f247b4 100644
--- a/src/python/grpcio_test/grpc_test/_adapter/_low_test.py
+++ b/src/python/grpcio/tests/unit/_adapter/_low_test.py
@@ -34,7 +34,7 @@ import unittest
 from grpc import _grpcio_metadata
 from grpc._adapter import _types
 from grpc._adapter import _low
-from grpc_test import test_common
+from tests.unit import test_common
 
 
 def wait_for_events(completion_queues, deadline):
diff --git a/src/python/grpcio_test/grpc_test/_adapter/_proto_scenarios.py b/src/python/grpcio/tests/unit/_adapter/_proto_scenarios.py
index b3d6ec8607..f55a7a23ea 100644
--- a/src/python/grpcio_test/grpc_test/_adapter/_proto_scenarios.py
+++ b/src/python/grpcio/tests/unit/_adapter/_proto_scenarios.py
@@ -32,7 +32,7 @@
 import abc
 import threading
 
-from grpc_test._junkdrawer import math_pb2
+from tests.unit._junkdrawer import math_pb2
 
 
 class ProtoScenario(object):
diff --git a/src/python/grpcio_test/grpc_test/_core_over_links_base_interface_test.py b/src/python/grpcio/tests/unit/_core_over_links_base_interface_test.py
index cafb6b6eae..efc990421a 100644
--- a/src/python/grpcio_test/grpc_test/_core_over_links_base_interface_test.py
+++ b/src/python/grpcio/tests/unit/_core_over_links_base_interface_test.py
@@ -41,10 +41,10 @@ from grpc._links import service
 from grpc.beta import interfaces as beta_interfaces
 from grpc.framework.core import implementations
 from grpc.framework.interfaces.base import utilities
-from grpc_test import test_common as grpc_test_common
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.interfaces.base import test_cases
-from grpc_test.framework.interfaces.base import test_interfaces
+from tests.unit import test_common as grpc_test_common
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.interfaces.base import test_cases
+from tests.unit.framework.interfaces.base import test_interfaces
 
 
 class _SerializationBehaviors(
diff --git a/src/python/grpcio_test/grpc_test/_crust_over_core_over_links_face_interface_test.py b/src/python/grpcio/tests/unit/_crust_over_core_over_links_face_interface_test.py
index a4d4dee38c..4faaaadc2b 100644
--- a/src/python/grpcio_test/grpc_test/_crust_over_core_over_links_face_interface_test.py
+++ b/src/python/grpcio/tests/unit/_crust_over_core_over_links_face_interface_test.py
@@ -40,10 +40,10 @@ from grpc.framework.core import implementations as core_implementations
 from grpc.framework.crust import implementations as crust_implementations
 from grpc.framework.foundation import logging_pool
 from grpc.framework.interfaces.links import utilities
-from grpc_test import test_common as grpc_test_common
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.interfaces.face import test_cases
-from grpc_test.framework.interfaces.face import test_interfaces
+from tests.unit import test_common as grpc_test_common
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.interfaces.face import test_cases
+from tests.unit.framework.interfaces.face import test_interfaces
 
 
 class _SerializationBehaviors(
diff --git a/src/python/grpcio_test/grpc_test/_cython/.gitignore b/src/python/grpcio/tests/unit/_cython/.gitignore
index c315029288..c315029288 100644
--- a/src/python/grpcio_test/grpc_test/_cython/.gitignore
+++ b/src/python/grpcio/tests/unit/_cython/.gitignore
diff --git a/src/python/grpcio_test/grpc_test/_cython/__init__.py b/src/python/grpcio/tests/unit/_cython/__init__.py
index b89398809f..b89398809f 100644
--- a/src/python/grpcio_test/grpc_test/_cython/__init__.py
+++ b/src/python/grpcio/tests/unit/_cython/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/_cython/adapter_low_test.py b/src/python/grpcio/tests/unit/_cython/adapter_low_test.py
index f1bec238cf..f1bec238cf 100644
--- a/src/python/grpcio_test/grpc_test/_cython/adapter_low_test.py
+++ b/src/python/grpcio/tests/unit/_cython/adapter_low_test.py
diff --git a/src/python/grpcio_test/grpc_test/_cython/cygrpc_test.py b/src/python/grpcio/tests/unit/_cython/cygrpc_test.py
index 1307a30ca0..84ee5c9eb5 100644
--- a/src/python/grpcio_test/grpc_test/_cython/cygrpc_test.py
+++ b/src/python/grpcio/tests/unit/_cython/cygrpc_test.py
@@ -31,8 +31,8 @@ import time
 import unittest
 
 from grpc._cython import cygrpc
-from grpc_test._cython import test_utilities
-from grpc_test import test_common
+from tests.unit._cython import test_utilities
+from tests.unit import test_common
 
 
 class TypeSmokeTest(unittest.TestCase):
diff --git a/src/python/grpcio_test/grpc_test/_cython/test_utilities.py b/src/python/grpcio/tests/unit/_cython/test_utilities.py
index 21ea3075b4..21ea3075b4 100644
--- a/src/python/grpcio_test/grpc_test/_cython/test_utilities.py
+++ b/src/python/grpcio/tests/unit/_cython/test_utilities.py
diff --git a/src/python/grpcio_test/grpc_test/_junkdrawer/__init__.py b/src/python/grpcio/tests/unit/_junkdrawer/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/_junkdrawer/__init__.py
+++ b/src/python/grpcio/tests/unit/_junkdrawer/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/_junkdrawer/math_pb2.py b/src/python/grpcio/tests/unit/_junkdrawer/math_pb2.py
index 20165955b4..20165955b4 100644
--- a/src/python/grpcio_test/grpc_test/_junkdrawer/math_pb2.py
+++ b/src/python/grpcio/tests/unit/_junkdrawer/math_pb2.py
diff --git a/src/python/grpcio_test/grpc_test/_junkdrawer/stock_pb2.py b/src/python/grpcio/tests/unit/_junkdrawer/stock_pb2.py
index eef18f82d6..eef18f82d6 100644
--- a/src/python/grpcio_test/grpc_test/_junkdrawer/stock_pb2.py
+++ b/src/python/grpcio/tests/unit/_junkdrawer/stock_pb2.py
diff --git a/src/python/grpcio_test/grpc_test/_links/__init__.py b/src/python/grpcio/tests/unit/_links/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/_links/__init__.py
+++ b/src/python/grpcio/tests/unit/_links/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/_links/_lonely_invocation_link_test.py b/src/python/grpcio/tests/unit/_links/_lonely_invocation_link_test.py
index 8e12e8cc22..890755f81c 100644
--- a/src/python/grpcio_test/grpc_test/_links/_lonely_invocation_link_test.py
+++ b/src/python/grpcio/tests/unit/_links/_lonely_invocation_link_test.py
@@ -34,9 +34,9 @@ import unittest
 from grpc._adapter import _intermediary_low
 from grpc._links import invocation
 from grpc.framework.interfaces.links import links
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.interfaces.links import test_cases
-from grpc_test.framework.interfaces.links import test_utilities
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.interfaces.links import test_cases
+from tests.unit.framework.interfaces.links import test_utilities
 
 _NULL_BEHAVIOR = lambda unused_argument: None
 
diff --git a/src/python/grpcio_test/grpc_test/_links/_proto_scenarios.py b/src/python/grpcio/tests/unit/_links/_proto_scenarios.py
index 0d74d66297..f69ff51b16 100644
--- a/src/python/grpcio_test/grpc_test/_links/_proto_scenarios.py
+++ b/src/python/grpcio/tests/unit/_links/_proto_scenarios.py
@@ -32,8 +32,8 @@
 import abc
 import threading
 
-from grpc_test._junkdrawer import math_pb2
-from grpc_test.framework.common import test_constants
+from tests.unit._junkdrawer import math_pb2
+from tests.unit.framework.common import test_constants
 
 
 class ProtoScenario(object):
diff --git a/src/python/grpcio_test/grpc_test/_links/_transmission_test.py b/src/python/grpcio/tests/unit/_links/_transmission_test.py
index 77e83d5561..888684d197 100644
--- a/src/python/grpcio_test/grpc_test/_links/_transmission_test.py
+++ b/src/python/grpcio/tests/unit/_links/_transmission_test.py
@@ -36,11 +36,11 @@ from grpc._links import invocation
 from grpc._links import service
 from grpc.beta import interfaces as beta_interfaces
 from grpc.framework.interfaces.links import links
-from grpc_test import test_common
-from grpc_test._links import _proto_scenarios
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.interfaces.links import test_cases
-from grpc_test.framework.interfaces.links import test_utilities
+from tests.unit import test_common
+from tests.unit._links import _proto_scenarios
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.interfaces.links import test_cases
+from tests.unit.framework.interfaces.links import test_utilities
 
 _IDENTITY = lambda x: x
 
diff --git a/src/python/grpcio_test/grpc_test/beta/__init__.py b/src/python/grpcio/tests/unit/beta/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/beta/__init__.py
+++ b/src/python/grpcio/tests/unit/beta/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/beta/_beta_features_test.py b/src/python/grpcio/tests/unit/beta/_beta_features_test.py
index 6b5090f8bb..5a7492ee9e 100644
--- a/src/python/grpcio_test/grpc_test/beta/_beta_features_test.py
+++ b/src/python/grpcio/tests/unit/beta/_beta_features_test.py
@@ -36,9 +36,9 @@ from grpc.beta import implementations
 from grpc.beta import interfaces
 from grpc.framework.common import cardinality
 from grpc.framework.interfaces.face import utilities
-from grpc_test import resources
-from grpc_test.beta import test_utilities
-from grpc_test.framework.common import test_constants
+from tests.unit import resources
+from tests.unit.beta import test_utilities
+from tests.unit.framework.common import test_constants
 
 _SERVER_HOST_OVERRIDE = 'foo.test.google.fr'
 
diff --git a/src/python/grpcio_test/grpc_test/beta/_connectivity_channel_test.py b/src/python/grpcio/tests/unit/beta/_connectivity_channel_test.py
index b3c05bdb0c..5dc8720639 100644
--- a/src/python/grpcio_test/grpc_test/beta/_connectivity_channel_test.py
+++ b/src/python/grpcio/tests/unit/beta/_connectivity_channel_test.py
@@ -37,7 +37,7 @@ from grpc._adapter import _low
 from grpc._adapter import _types
 from grpc.beta import _connectivity_channel
 from grpc.beta import interfaces
-from grpc_test.framework.common import test_constants
+from tests.unit.framework.common import test_constants
 
 
 def _drive_completion_queue(completion_queue):
diff --git a/src/python/grpcio_test/grpc_test/beta/_face_interface_test.py b/src/python/grpcio/tests/unit/beta/_face_interface_test.py
index aa33e1e6f8..55c0d20060 100644
--- a/src/python/grpcio_test/grpc_test/beta/_face_interface_test.py
+++ b/src/python/grpcio/tests/unit/beta/_face_interface_test.py
@@ -34,12 +34,12 @@ import unittest
 
 from grpc.beta import implementations
 from grpc.beta import interfaces
-from grpc_test import resources
-from grpc_test import test_common as grpc_test_common
-from grpc_test.beta import test_utilities
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.interfaces.face import test_cases
-from grpc_test.framework.interfaces.face import test_interfaces
+from tests.unit import resources
+from tests.unit import test_common as grpc_test_common
+from tests.unit.beta import test_utilities
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.interfaces.face import test_cases
+from tests.unit.framework.interfaces.face import test_interfaces
 
 _SERVER_HOST_OVERRIDE = 'foo.test.google.fr'
 
diff --git a/src/python/grpcio_test/grpc_test/beta/_not_found_test.py b/src/python/grpcio/tests/unit/beta/_not_found_test.py
index 5feb997fef..44fcd1e13c 100644
--- a/src/python/grpcio_test/grpc_test/beta/_not_found_test.py
+++ b/src/python/grpcio/tests/unit/beta/_not_found_test.py
@@ -34,7 +34,7 @@ import unittest
 from grpc.beta import implementations
 from grpc.beta import interfaces
 from grpc.framework.interfaces.face import face
-from grpc_test.framework.common import test_constants
+from tests.unit.framework.common import test_constants
 
 
 class NotFoundTest(unittest.TestCase):
diff --git a/src/python/grpcio_test/grpc_test/beta/_utilities_test.py b/src/python/grpcio/tests/unit/beta/_utilities_test.py
index 996cea9118..08ce98e751 100644
--- a/src/python/grpcio_test/grpc_test/beta/_utilities_test.py
+++ b/src/python/grpcio/tests/unit/beta/_utilities_test.py
@@ -38,7 +38,7 @@ from grpc._adapter import _types
 from grpc.beta import implementations
 from grpc.beta import utilities
 from grpc.framework.foundation import future
-from grpc_test.framework.common import test_constants
+from tests.unit.framework.common import test_constants
 
 
 def _drive_completion_queue(completion_queue):
diff --git a/src/python/grpcio_test/grpc_test/beta/test_utilities.py b/src/python/grpcio/tests/unit/beta/test_utilities.py
index 24a8600e12..24a8600e12 100644
--- a/src/python/grpcio_test/grpc_test/beta/test_utilities.py
+++ b/src/python/grpcio/tests/unit/beta/test_utilities.py
diff --git a/src/python/grpcio_test/grpc_test/credentials/README b/src/python/grpcio/tests/unit/credentials/README
index cb20dcb49f..cb20dcb49f 100644
--- a/src/python/grpcio_test/grpc_test/credentials/README
+++ b/src/python/grpcio/tests/unit/credentials/README
diff --git a/src/python/grpcio_test/grpc_test/credentials/ca.pem b/src/python/grpcio/tests/unit/credentials/ca.pem
index 6c8511a73c..6c8511a73c 100755
--- a/src/python/grpcio_test/grpc_test/credentials/ca.pem
+++ b/src/python/grpcio/tests/unit/credentials/ca.pem
diff --git a/src/python/grpcio_test/grpc_test/credentials/server1.key b/src/python/grpcio/tests/unit/credentials/server1.key
index 143a5b8765..143a5b8765 100755
--- a/src/python/grpcio_test/grpc_test/credentials/server1.key
+++ b/src/python/grpcio/tests/unit/credentials/server1.key
diff --git a/src/python/grpcio_test/grpc_test/credentials/server1.pem b/src/python/grpcio/tests/unit/credentials/server1.pem
index f3d43fcc5b..f3d43fcc5b 100755
--- a/src/python/grpcio_test/grpc_test/credentials/server1.pem
+++ b/src/python/grpcio/tests/unit/credentials/server1.pem
diff --git a/src/python/grpcio_test/grpc_test/framework/__init__.py b/src/python/grpcio/tests/unit/framework/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/framework/__init__.py
+++ b/src/python/grpcio/tests/unit/framework/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/framework/_crust_over_core_face_interface_test.py b/src/python/grpcio/tests/unit/framework/_crust_over_core_face_interface_test.py
index 30bb85f6c3..360ecc95d5 100644
--- a/src/python/grpcio_test/grpc_test/framework/_crust_over_core_face_interface_test.py
+++ b/src/python/grpcio/tests/unit/framework/_crust_over_core_face_interface_test.py
@@ -36,10 +36,10 @@ from grpc.framework.core import implementations as core_implementations
 from grpc.framework.crust import implementations as crust_implementations
 from grpc.framework.foundation import logging_pool
 from grpc.framework.interfaces.links import utilities
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.interfaces.face import test_cases
-from grpc_test.framework.interfaces.face import test_interfaces
-from grpc_test.framework.interfaces.links import test_utilities
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.interfaces.face import test_cases
+from tests.unit.framework.interfaces.face import test_interfaces
+from tests.unit.framework.interfaces.links import test_utilities
 
 
 class _Implementation(test_interfaces.Implementation):
diff --git a/src/python/grpcio_test/grpc_test/framework/common/__init__.py b/src/python/grpcio/tests/unit/framework/common/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/framework/common/__init__.py
+++ b/src/python/grpcio/tests/unit/framework/common/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/framework/common/test_constants.py b/src/python/grpcio/tests/unit/framework/common/test_constants.py
index e1d3c2709d..e1d3c2709d 100644
--- a/src/python/grpcio_test/grpc_test/framework/common/test_constants.py
+++ b/src/python/grpcio/tests/unit/framework/common/test_constants.py
diff --git a/src/python/grpcio_test/grpc_test/framework/common/test_control.py b/src/python/grpcio/tests/unit/framework/common/test_control.py
index 8d6eba5c2c..8d6eba5c2c 100644
--- a/src/python/grpcio_test/grpc_test/framework/common/test_control.py
+++ b/src/python/grpcio/tests/unit/framework/common/test_control.py
diff --git a/src/python/grpcio_test/grpc_test/framework/common/test_coverage.py b/src/python/grpcio/tests/unit/framework/common/test_coverage.py
index a7ed3582c4..a7ed3582c4 100644
--- a/src/python/grpcio_test/grpc_test/framework/common/test_coverage.py
+++ b/src/python/grpcio/tests/unit/framework/common/test_coverage.py
diff --git a/src/python/grpcio_test/grpc_test/framework/core/__init__.py b/src/python/grpcio/tests/unit/framework/core/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/framework/core/__init__.py
+++ b/src/python/grpcio/tests/unit/framework/core/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/framework/core/_base_interface_test.py b/src/python/grpcio/tests/unit/framework/core/_base_interface_test.py
index 8d72f131d5..1310292306 100644
--- a/src/python/grpcio_test/grpc_test/framework/core/_base_interface_test.py
+++ b/src/python/grpcio/tests/unit/framework/core/_base_interface_test.py
@@ -36,9 +36,9 @@ import unittest
 
 from grpc.framework.core import implementations
 from grpc.framework.interfaces.base import utilities
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.interfaces.base import test_cases
-from grpc_test.framework.interfaces.base import test_interfaces
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.interfaces.base import test_cases
+from tests.unit.framework.interfaces.base import test_interfaces
 
 
 class _Implementation(test_interfaces.Implementation):
diff --git a/src/python/grpcio_test/grpc_test/framework/face/__init__.py b/src/python/grpcio/tests/unit/framework/face/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/__init__.py
+++ b/src/python/grpcio/tests/unit/framework/face/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/__init__.py b/src/python/grpcio/tests/unit/framework/face/testing/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/__init__.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/base_util.py b/src/python/grpcio/tests/unit/framework/face/testing/base_util.py
index 1df1529b27..1df1529b27 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/base_util.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/base_util.py
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/blocking_invocation_inline_service_test_case.py b/src/python/grpcio/tests/unit/framework/face/testing/blocking_invocation_inline_service_test_case.py
index 251e1eb68e..0613516421 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/blocking_invocation_inline_service_test_case.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/blocking_invocation_inline_service_test_case.py
@@ -34,12 +34,12 @@ import abc
 import unittest  # pylint: disable=unused-import
 
 from grpc.framework.face import exceptions
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.face.testing import control
-from grpc_test.framework.face.testing import coverage
-from grpc_test.framework.face.testing import digest
-from grpc_test.framework.face.testing import stock_service
-from grpc_test.framework.face.testing import test_case
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.face.testing import control
+from tests.unit.framework.face.testing import coverage
+from tests.unit.framework.face.testing import digest
+from tests.unit.framework.face.testing import stock_service
+from tests.unit.framework.face.testing import test_case
 
 
 class BlockingInvocationInlineServiceTestCase(
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/callback.py b/src/python/grpcio/tests/unit/framework/face/testing/callback.py
index d0e63c8c56..d0e63c8c56 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/callback.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/callback.py
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/control.py b/src/python/grpcio/tests/unit/framework/face/testing/control.py
index 3960c4e649..3960c4e649 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/control.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/control.py
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/coverage.py b/src/python/grpcio/tests/unit/framework/face/testing/coverage.py
index f3aca113fe..f3aca113fe 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/coverage.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/coverage.py
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/digest.py b/src/python/grpcio/tests/unit/framework/face/testing/digest.py
index 54ff21779a..39f28b9657 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/digest.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/digest.py
@@ -40,9 +40,9 @@ from grpc.framework.face import exceptions
 from grpc.framework.face import interfaces as face_interfaces
 from grpc.framework.foundation import stream
 from grpc.framework.foundation import stream_util
-from grpc_test.framework.face.testing import control as testing_control  # pylint: disable=unused-import
-from grpc_test.framework.face.testing import interfaces  # pylint: disable=unused-import
-from grpc_test.framework.face.testing import service as testing_service  # pylint: disable=unused-import
+from tests.unit.framework.face.testing import control as testing_control  # pylint: disable=unused-import
+from tests.unit.framework.face.testing import interfaces  # pylint: disable=unused-import
+from tests.unit.framework.face.testing import service as testing_service  # pylint: disable=unused-import
 
 _IDENTITY = lambda x: x
 
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/event_invocation_synchronous_event_service_test_case.py b/src/python/grpcio/tests/unit/framework/face/testing/event_invocation_synchronous_event_service_test_case.py
index 9df77678eb..179f3a2f67 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/event_invocation_synchronous_event_service_test_case.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/event_invocation_synchronous_event_service_test_case.py
@@ -33,13 +33,13 @@ import abc
 import unittest
 
 from grpc.framework.face import interfaces
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.face.testing import callback as testing_callback
-from grpc_test.framework.face.testing import control
-from grpc_test.framework.face.testing import coverage
-from grpc_test.framework.face.testing import digest
-from grpc_test.framework.face.testing import stock_service
-from grpc_test.framework.face.testing import test_case
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.face.testing import callback as testing_callback
+from tests.unit.framework.face.testing import control
+from tests.unit.framework.face.testing import coverage
+from tests.unit.framework.face.testing import digest
+from tests.unit.framework.face.testing import stock_service
+from tests.unit.framework.face.testing import test_case
 
 
 class EventInvocationSynchronousEventServiceTestCase(
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/future_invocation_asynchronous_event_service_test_case.py b/src/python/grpcio/tests/unit/framework/face/testing/future_invocation_asynchronous_event_service_test_case.py
index 70d86a0422..485524a356 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/future_invocation_asynchronous_event_service_test_case.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/future_invocation_asynchronous_event_service_test_case.py
@@ -37,12 +37,12 @@ import unittest
 from grpc.framework.face import exceptions
 from grpc.framework.foundation import future
 from grpc.framework.foundation import logging_pool
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.face.testing import control
-from grpc_test.framework.face.testing import coverage
-from grpc_test.framework.face.testing import digest
-from grpc_test.framework.face.testing import stock_service
-from grpc_test.framework.face.testing import test_case
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.face.testing import control
+from tests.unit.framework.face.testing import coverage
+from tests.unit.framework.face.testing import digest
+from tests.unit.framework.face.testing import stock_service
+from tests.unit.framework.face.testing import test_case
 
 _MAXIMUM_POOL_SIZE = 10
 
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/interfaces.py b/src/python/grpcio/tests/unit/framework/face/testing/interfaces.py
index 5932dabf1e..5932dabf1e 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/interfaces.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/interfaces.py
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/service.py b/src/python/grpcio/tests/unit/framework/face/testing/service.py
index ee9d6a3da3..ac0b89b6ee 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/service.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/service.py
@@ -33,7 +33,7 @@ import abc
 
 # interfaces is referenced from specification in this module.
 from grpc.framework.face import interfaces as face_interfaces  # pylint: disable=unused-import
-from grpc_test.framework.face.testing import interfaces
+from tests.unit.framework.face.testing import interfaces
 
 
 class UnaryUnaryTestMethodImplementation(interfaces.Method):
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/stock_service.py b/src/python/grpcio/tests/unit/framework/face/testing/stock_service.py
index 0f83ca4db1..117c723f79 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/stock_service.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/stock_service.py
@@ -33,8 +33,8 @@ from grpc.framework.common import cardinality
 from grpc.framework.foundation import abandonment
 from grpc.framework.foundation import stream
 from grpc.framework.foundation import stream_util
-from grpc_test.framework.face.testing import service
-from grpc_test._junkdrawer import stock_pb2
+from tests.unit.framework.face.testing import service
+from tests.unit._junkdrawer import stock_pb2
 
 SYMBOL_FORMAT = 'test symbol:%03d'
 STREAM_LENGTH = 400
diff --git a/src/python/grpcio_test/grpc_test/framework/face/testing/test_case.py b/src/python/grpcio/tests/unit/framework/face/testing/test_case.py
index 858d5cf7fd..23d4d919c2 100644
--- a/src/python/grpcio_test/grpc_test/framework/face/testing/test_case.py
+++ b/src/python/grpcio/tests/unit/framework/face/testing/test_case.py
@@ -33,7 +33,7 @@ import abc
 
 # face_interfaces and interfaces are referenced in specification in this module.
 from grpc.framework.face import interfaces as face_interfaces  # pylint: disable=unused-import
-from grpc_test.framework.face.testing import interfaces  # pylint: disable=unused-import
+from tests.unit.framework.face.testing import interfaces  # pylint: disable=unused-import
 
 
 class FaceTestCase(object):
diff --git a/src/python/grpcio_test/grpc_test/framework/foundation/__init__.py b/src/python/grpcio/tests/unit/framework/foundation/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/framework/foundation/__init__.py
+++ b/src/python/grpcio/tests/unit/framework/foundation/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/framework/foundation/_later_test.py b/src/python/grpcio/tests/unit/framework/foundation/_later_test.py
index 6c2459e185..6c2459e185 100644
--- a/src/python/grpcio_test/grpc_test/framework/foundation/_later_test.py
+++ b/src/python/grpcio/tests/unit/framework/foundation/_later_test.py
diff --git a/src/python/grpcio_test/grpc_test/framework/foundation/_logging_pool_test.py b/src/python/grpcio/tests/unit/framework/foundation/_logging_pool_test.py
index 452802da6a..452802da6a 100644
--- a/src/python/grpcio_test/grpc_test/framework/foundation/_logging_pool_test.py
+++ b/src/python/grpcio/tests/unit/framework/foundation/_logging_pool_test.py
diff --git a/src/python/grpcio_test/grpc_test/framework/foundation/stream_testing.py b/src/python/grpcio/tests/unit/framework/foundation/stream_testing.py
index 098a53d5e7..098a53d5e7 100644
--- a/src/python/grpcio_test/grpc_test/framework/foundation/stream_testing.py
+++ b/src/python/grpcio/tests/unit/framework/foundation/stream_testing.py
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/__init__.py b/src/python/grpcio/tests/unit/framework/interfaces/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/__init__.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/base/__init__.py b/src/python/grpcio/tests/unit/framework/interfaces/base/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/base/__init__.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/base/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/base/_control.py b/src/python/grpcio/tests/unit/framework/interfaces/base/_control.py
index 46a01876d8..38102b198a 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/base/_control.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/base/_control.py
@@ -37,10 +37,10 @@ import threading
 import time
 
 from grpc.framework.interfaces.base import base
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.interfaces.base import _sequence
-from grpc_test.framework.interfaces.base import _state
-from grpc_test.framework.interfaces.base import test_interfaces  # pylint: disable=unused-import
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.interfaces.base import _sequence
+from tests.unit.framework.interfaces.base import _state
+from tests.unit.framework.interfaces.base import test_interfaces  # pylint: disable=unused-import
 
 _GROUP = 'base test cases test group'
 _METHOD = 'base test cases test method'
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/base/_sequence.py b/src/python/grpcio/tests/unit/framework/interfaces/base/_sequence.py
index f547d91681..571d0e1e63 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/base/_sequence.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/base/_sequence.py
@@ -33,7 +33,7 @@ import collections
 import enum
 
 from grpc.framework.interfaces.base import base
-from grpc_test.framework.common import test_constants
+from tests.unit.framework.common import test_constants
 
 
 class Invocation(
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/base/_state.py b/src/python/grpcio/tests/unit/framework/interfaces/base/_state.py
index 21cf33aeb6..21cf33aeb6 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/base/_state.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/base/_state.py
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/base/test_cases.py b/src/python/grpcio/tests/unit/framework/interfaces/base/test_cases.py
index ddda1018c3..4f8e26c9a2 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/base/test_cases.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/base/test_cases.py
@@ -38,9 +38,9 @@ import unittest
 from grpc.framework.foundation import logging_pool
 from grpc.framework.interfaces.base import base
 from grpc.framework.interfaces.base import utilities
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.interfaces.base import _control
-from grpc_test.framework.interfaces.base import test_interfaces
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.interfaces.base import _control
+from tests.unit.framework.interfaces.base import test_interfaces
 
 _SYNCHRONICITY_VARIATION = (('Sync', False), ('Async', True))
 
@@ -271,6 +271,7 @@ def test_cases(implementation):
                 '_randomness': randomness,
                 '_synchronicity_variation': synchronicity_variation[1],
                 '_controller_creator': controller_creator,
+                '__module__': implementation.__module__,
                }))
 
   return test_case_classes
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/base/test_interfaces.py b/src/python/grpcio/tests/unit/framework/interfaces/base/test_interfaces.py
index 02426ab846..84afd24d47 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/base/test_interfaces.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/base/test_interfaces.py
@@ -131,7 +131,7 @@ class Implementation(object):
 
   @abc.abstractmethod
   def service_initial_metadata(self):
-    """Provices an operation's service-side initial metadata.
+    """Provides an operation's service-side initial metadata.
 
     Returns:
       A value to use for an operation's service-side initial metadata, or
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_3069_test_constant.py b/src/python/grpcio/tests/unit/framework/interfaces/face/_3069_test_constant.py
index 363d9ce8f1..1ea356c0bf 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_3069_test_constant.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/face/_3069_test_constant.py
@@ -30,7 +30,7 @@
 """A test constant working around issue 3069."""
 
 # test_constants is referenced from specification in this module.
-from grpc_test.framework.common import test_constants  # pylint: disable=unused-import
+from tests.unit.framework.common import test_constants  # pylint: disable=unused-import
 
 # TODO(issue 3069): Replace uses of this constant with
 # test_constants.SHORT_TIMEOUT.
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/__init__.py b/src/python/grpcio/tests/unit/framework/interfaces/face/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/__init__.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/face/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_blocking_invocation_inline_service.py b/src/python/grpcio/tests/unit/framework/interfaces/face/_blocking_invocation_inline_service.py
index 2d2a081955..3bcefa601d 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_blocking_invocation_inline_service.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/face/_blocking_invocation_inline_service.py
@@ -34,13 +34,13 @@ import unittest
 
 # test_interfaces is referenced from specification in this module.
 from grpc.framework.interfaces.face import face
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.common import test_control
-from grpc_test.framework.common import test_coverage
-from grpc_test.framework.interfaces.face import _3069_test_constant
-from grpc_test.framework.interfaces.face import _digest
-from grpc_test.framework.interfaces.face import _stock_service
-from grpc_test.framework.interfaces.face import test_interfaces  # pylint: disable=unused-import
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.common import test_control
+from tests.unit.framework.common import test_coverage
+from tests.unit.framework.interfaces.face import _3069_test_constant
+from tests.unit.framework.interfaces.face import _digest
+from tests.unit.framework.interfaces.face import _stock_service
+from tests.unit.framework.interfaces.face import test_interfaces  # pylint: disable=unused-import
 
 
 class TestCase(test_coverage.Coverage, unittest.TestCase):
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_digest.py b/src/python/grpcio/tests/unit/framework/interfaces/face/_digest.py
index da56ed7b27..9304b6b1db 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_digest.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/face/_digest.py
@@ -39,9 +39,9 @@ from grpc.framework.common import style
 from grpc.framework.foundation import stream
 from grpc.framework.foundation import stream_util
 from grpc.framework.interfaces.face import face
-from grpc_test.framework.common import test_control  # pylint: disable=unused-import
-from grpc_test.framework.interfaces.face import _service  # pylint: disable=unused-import
-from grpc_test.framework.interfaces.face import test_interfaces  # pylint: disable=unused-import
+from tests.unit.framework.common import test_control  # pylint: disable=unused-import
+from tests.unit.framework.interfaces.face import _service  # pylint: disable=unused-import
+from tests.unit.framework.interfaces.face import test_interfaces  # pylint: disable=unused-import
 
 _IDENTITY = lambda x: x
 
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_event_invocation_synchronous_event_service.py b/src/python/grpcio/tests/unit/framework/interfaces/face/_event_invocation_synchronous_event_service.py
index 7cb273bf78..34db6c3e55 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_event_invocation_synchronous_event_service.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/face/_event_invocation_synchronous_event_service.py
@@ -34,14 +34,14 @@ import unittest
 
 # test_interfaces is referenced from specification in this module.
 from grpc.framework.interfaces.face import face
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.common import test_control
-from grpc_test.framework.common import test_coverage
-from grpc_test.framework.interfaces.face import _3069_test_constant
-from grpc_test.framework.interfaces.face import _digest
-from grpc_test.framework.interfaces.face import _receiver
-from grpc_test.framework.interfaces.face import _stock_service
-from grpc_test.framework.interfaces.face import test_interfaces  # pylint: disable=unused-import
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.common import test_control
+from tests.unit.framework.common import test_coverage
+from tests.unit.framework.interfaces.face import _3069_test_constant
+from tests.unit.framework.interfaces.face import _digest
+from tests.unit.framework.interfaces.face import _receiver
+from tests.unit.framework.interfaces.face import _stock_service
+from tests.unit.framework.interfaces.face import test_interfaces  # pylint: disable=unused-import
 
 
 class TestCase(test_coverage.Coverage, unittest.TestCase):
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_future_invocation_asynchronous_event_service.py b/src/python/grpcio/tests/unit/framework/interfaces/face/_future_invocation_asynchronous_event_service.py
index 3032736975..c178f2f108 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_future_invocation_asynchronous_event_service.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/face/_future_invocation_asynchronous_event_service.py
@@ -37,13 +37,13 @@ import unittest
 # test_interfaces is referenced from specification in this module.
 from grpc.framework.foundation import logging_pool
 from grpc.framework.interfaces.face import face
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.common import test_control
-from grpc_test.framework.common import test_coverage
-from grpc_test.framework.interfaces.face import _3069_test_constant
-from grpc_test.framework.interfaces.face import _digest
-from grpc_test.framework.interfaces.face import _stock_service
-from grpc_test.framework.interfaces.face import test_interfaces  # pylint: disable=unused-import
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.common import test_control
+from tests.unit.framework.common import test_coverage
+from tests.unit.framework.interfaces.face import _3069_test_constant
+from tests.unit.framework.interfaces.face import _digest
+from tests.unit.framework.interfaces.face import _stock_service
+from tests.unit.framework.interfaces.face import test_interfaces  # pylint: disable=unused-import
 
 
 class _PauseableIterator(object):
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_invocation.py b/src/python/grpcio/tests/unit/framework/interfaces/face/_invocation.py
index 448e845a08..448e845a08 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_invocation.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/face/_invocation.py
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_receiver.py b/src/python/grpcio/tests/unit/framework/interfaces/face/_receiver.py
index 2e444ff09d..2e444ff09d 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_receiver.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/face/_receiver.py
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_service.py b/src/python/grpcio/tests/unit/framework/interfaces/face/_service.py
index e25b8a038c..28941e2ad0 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_service.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/face/_service.py
@@ -33,7 +33,7 @@ import abc
 
 # face is referenced from specification in this module.
 from grpc.framework.interfaces.face import face  # pylint: disable=unused-import
-from grpc_test.framework.interfaces.face import test_interfaces
+from tests.unit.framework.interfaces.face import test_interfaces
 
 
 class UnaryUnaryTestMethodImplementation(test_interfaces.Method):
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_stock_service.py b/src/python/grpcio/tests/unit/framework/interfaces/face/_stock_service.py
index 808e2c4e36..5299655bb3 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/_stock_service.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/face/_stock_service.py
@@ -32,9 +32,9 @@
 from grpc.framework.common import cardinality
 from grpc.framework.foundation import abandonment
 from grpc.framework.foundation import stream
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.interfaces.face import _service
-from grpc_test._junkdrawer import stock_pb2
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.interfaces.face import _service
+from tests.unit._junkdrawer import stock_pb2
 
 _STOCK_GROUP_NAME = 'Stock'
 _SYMBOL_FORMAT = 'test symbol:%03d'
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/test_cases.py b/src/python/grpcio/tests/unit/framework/interfaces/face/test_cases.py
index ca623662f7..462829b660 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/test_cases.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/face/test_cases.py
@@ -33,11 +33,11 @@
 import unittest  # pylint: disable=unused-import
 
 # test_interfaces is referenced from specification in this module.
-from grpc_test.framework.interfaces.face import _blocking_invocation_inline_service
-from grpc_test.framework.interfaces.face import _event_invocation_synchronous_event_service
-from grpc_test.framework.interfaces.face import _future_invocation_asynchronous_event_service
-from grpc_test.framework.interfaces.face import _invocation
-from grpc_test.framework.interfaces.face import test_interfaces  # pylint: disable=unused-import
+from tests.unit.framework.interfaces.face import _blocking_invocation_inline_service
+from tests.unit.framework.interfaces.face import _event_invocation_synchronous_event_service
+from tests.unit.framework.interfaces.face import _future_invocation_asynchronous_event_service
+from tests.unit.framework.interfaces.face import _invocation
+from tests.unit.framework.interfaces.face import test_interfaces  # pylint: disable=unused-import
 
 _TEST_CASE_SUPERCLASSES = (
     _blocking_invocation_inline_service.TestCase,
@@ -63,5 +63,7 @@ def test_cases(implementation):
       test_case_classes.append(
           type(invoker_constructor.name() + super_class.NAME, (super_class,),
                {'implementation': implementation,
-                'invoker_constructor': invoker_constructor}))
+                'invoker_constructor': invoker_constructor,
+                '__module__': implementation.__module__,
+               }))
   return test_case_classes
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/face/test_interfaces.py b/src/python/grpcio/tests/unit/framework/interfaces/face/test_interfaces.py
index b2b5c10fa6..b2b5c10fa6 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/face/test_interfaces.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/face/test_interfaces.py
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/links/__init__.py b/src/python/grpcio/tests/unit/framework/interfaces/links/__init__.py
index 7086519106..7086519106 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/links/__init__.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/links/__init__.py
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/links/test_cases.py b/src/python/grpcio/tests/unit/framework/interfaces/links/test_cases.py
index ecf49d9cdb..dace6c23f3 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/links/test_cases.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/links/test_cases.py
@@ -34,8 +34,8 @@ import abc
 import unittest  # pylint: disable=unused-import
 
 from grpc.framework.interfaces.links import links
-from grpc_test.framework.common import test_constants
-from grpc_test.framework.interfaces.links import test_utilities
+from tests.unit.framework.common import test_constants
+from tests.unit.framework.interfaces.links import test_utilities
 
 
 def at_least_n_payloads_received_predicate(n):
diff --git a/src/python/grpcio_test/grpc_test/framework/interfaces/links/test_utilities.py b/src/python/grpcio/tests/unit/framework/interfaces/links/test_utilities.py
index 39c7f2fc63..39c7f2fc63 100644
--- a/src/python/grpcio_test/grpc_test/framework/interfaces/links/test_utilities.py
+++ b/src/python/grpcio/tests/unit/framework/interfaces/links/test_utilities.py
diff --git a/src/python/grpcio_test/grpc_test/resources.py b/src/python/grpcio/tests/unit/resources.py
index 2c3045313d..2c3045313d 100644
--- a/src/python/grpcio_test/grpc_test/resources.py
+++ b/src/python/grpcio/tests/unit/resources.py
diff --git a/src/python/grpcio_test/grpc_test/test_common.py b/src/python/grpcio/tests/unit/test_common.py
index 29431bfb9d..29431bfb9d 100644
--- a/src/python/grpcio_test/grpc_test/test_common.py
+++ b/src/python/grpcio/tests/unit/test_common.py
diff --git a/src/python/grpcio_test/.gitignore b/src/python/grpcio_test/.gitignore
deleted file mode 100644
index 6158313bde..0000000000
--- a/src/python/grpcio_test/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-MANIFEST
-*.egg-info/
-build/
-dist/
-*.egg
-*.egg/
-*.eggs/
-*_pb2.py
-.coverage
-.coverage.*
-.cache/
-nosetests.xml
diff --git a/src/python/grpcio_test/MANIFEST.in b/src/python/grpcio_test/MANIFEST.in
deleted file mode 100644
index c9327307dc..0000000000
--- a/src/python/grpcio_test/MANIFEST.in
+++ /dev/null
@@ -1,4 +0,0 @@
-graft grpc_interop
-graft grpc_test
-include commands.py
-include requirements.txt
diff --git a/src/python/grpcio_test/commands.py b/src/python/grpcio_test/commands.py
deleted file mode 100644
index edaa2aa72d..0000000000
--- a/src/python/grpcio_test/commands.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2015, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Provides distutils command classes for the GRPC Python test setup process."""
-
-import distutils
-import os
-import os.path
-import subprocess
-import sys
-
-import setuptools
-from setuptools.command import build_py
-
-
-class RunTests(setuptools.Command):
-  """Command to run all tests via py.test."""
-
-  description = ''
-  user_options = [('pytest-args=', 'a', 'arguments to pass to py.test')]
-
-  def initialize_options(self):
-    self.pytest_args = []
-
-  def finalize_options(self):
-    pass
-
-  def run(self):
-    # We import here to ensure that setup.py has had a chance to install the
-    # relevant package eggs first.
-    import pytest
-
-    self.run_command('build_proto_modules')
-    result = pytest.main(self.pytest_args)
-    if result != 0:
-      raise SystemExit(result)
-
-
-class BuildProtoModules(setuptools.Command):
-  """Command to generate project *_pb2.py modules from proto files."""
-
-  description = ''
-  user_options = []
-
-  def initialize_options(self):
-    pass
-
-  def finalize_options(self):
-    self.protoc_command = distutils.spawn.find_executable('protoc')
-    self.grpc_python_plugin_command = distutils.spawn.find_executable(
-        'grpc_python_plugin')
-
-  def run(self):
-    paths = []
-    root_directory = os.getcwd()
-    for walk_root, directories, filenames in os.walk(root_directory):
-      for filename in filenames:
-        if filename.endswith('.proto'):
-          paths.append(os.path.join(walk_root, filename))
-    command = [
-        self.protoc_command,
-        '--plugin=protoc-gen-python-grpc={}'.format(
-            self.grpc_python_plugin_command),
-        '-I {}'.format(root_directory),
-        '--python_out={}'.format(root_directory),
-        '--python-grpc_out={}'.format(root_directory),
-    ] + paths
-    try:
-      subprocess.check_output(' '.join(command), cwd=root_directory, shell=True,
-                              stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError as e:
-      raise Exception('{}\nOutput:\n{}'.format(e.message, e.output))
-
-
-class BuildPy(build_py.build_py):
-  """Custom project build command."""
-
-  def run(self):
-    self.run_command('build_proto_modules')
-    build_py.build_py.run(self)
diff --git a/src/python/grpcio_test/grpc_test/conftest.py b/src/python/grpcio_test/grpc_test/conftest.py
deleted file mode 100644
index 357320ec64..0000000000
--- a/src/python/grpcio_test/grpc_test/conftest.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import types
-import unittest
-
-import pytest
-
-
-class LoadTestsSuiteCollector(pytest.Collector):
-
-  def __init__(self, name, parent, suite):
-    super(LoadTestsSuiteCollector, self).__init__(name, parent=parent)
-    self.suite = suite
-    self.obj = suite
-
-  def collect(self):
-    collected = []
-    for case in self.suite:
-      if isinstance(case, unittest.TestCase):
-        collected.append(LoadTestsCase(case.id(), self, case))
-      elif isinstance(case, unittest.TestSuite):
-        collected.append(
-            LoadTestsSuiteCollector('suite_child_of_mine', self, case))
-    return collected
-
-  def reportinfo(self):
-    return str(self.suite)
-
-
-class LoadTestsCase(pytest.Function):
-
-  def __init__(self, name, parent, item):
-    super(LoadTestsCase, self).__init__(name, parent, callobj=self._item_run)
-    self.item = item
-
-  def _item_run(self):
-    result = unittest.TestResult()
-    self.item(result)
-    if result.failures:
-      test_method, trace = result.failures[0]
-      pytest.fail(trace, False)
-    elif result.errors:
-      test_method, trace = result.errors[0]
-      pytest.fail(trace, False)
-    elif result.skipped:
-      test_method, reason = result.skipped[0]
-      pytest.skip(reason)
-
-
-def pytest_pycollect_makeitem(collector, name, obj):
-  if name == 'load_tests' and isinstance(obj, types.FunctionType):
-    suite = unittest.TestSuite()
-    loader = unittest.TestLoader()
-    pattern = '*'
-    try:
-      # Check that the 'load_tests' object is actually a callable that actually
-      # accepts the arguments expected for the load_tests protocol.
-      suite = obj(loader, suite, pattern)
-    except Exception as e:
-      return None
-    else:
-      return LoadTestsSuiteCollector(name, collector, suite)
diff --git a/src/python/grpcio_test/requirements.txt b/src/python/grpcio_test/requirements.txt
deleted file mode 100644
index fea80ca07f..0000000000
--- a/src/python/grpcio_test/requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-grpcio>=0.11.0b0
-oauth2client>=1.4.7
-protobuf>=3.0.0a3
-pytest>=2.6
-pytest-cov>=2.0
-pytest-xdist>=1.11
diff --git a/src/python/grpcio_test/setup.cfg b/src/python/grpcio_test/setup.cfg
deleted file mode 100644
index 3be93cb918..0000000000
--- a/src/python/grpcio_test/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[pytest]
-python_files = *_test.py