diff --git a/docs/py_test.md b/docs/py_test.md
index ea1294df..b9c8a34e 100644
--- a/docs/py_test.md
+++ b/docs/py_test.md
@@ -95,7 +95,7 @@ py_pytest_main wraps the template rendering target and the final py_library.
 ## py_test
 
 <pre>
-py_test(<a href="#py_test-name">name</a>, <a href="#py_test-srcs">srcs</a>, <a href="#py_test-main">main</a>, <a href="#py_test-pytest_main">pytest_main</a>, <a href="#py_test-kwargs">kwargs</a>)
+py_test(<a href="#py_test-name">name</a>, <a href="#py_test-srcs">srcs</a>, <a href="#py_test-main">main</a>, <a href="#py_test-pytest_main">pytest_main</a>, <a href="#py_test-tags">tags</a>, <a href="#py_test-kwargs">kwargs</a>)
 </pre>
 
 Identical to [py_binary](./py_binary.md), but produces a target that can be used with `bazel test`.
@@ -109,6 +109,7 @@ Identical to [py_binary](./py_binary.md), but produces a target that can be used
 | <a id="py_test-srcs"></a>srcs |  Python source files.   |  <code>[]</code> |
 | <a id="py_test-main"></a>main |  Entry point. Like rules_python, this is treated as a suffix of a file that should appear among the srcs. If absent, then <code>[name].py</code> is tried. As a final fallback, if the srcs has a single file, that is used as the main.   |  <code>None</code> |
 | <a id="py_test-pytest_main"></a>pytest_main |  If set, generate a [py_pytest_main](#py_pytest_main) script and use it as the main. The deps should include the pytest package (as well as the coverage package if desired).   |  <code>False</code> |
+| <a id="py_test-tags"></a>tags |  If set, tags to be passed to generated targets (e.g. [py_pytest_main](#py_pytest_main)).   |  <code>[]</code> |
 | <a id="py_test-kwargs"></a>kwargs |  additional named parameters to <code>py_binary_rule</code>.   |  none |
 
 
diff --git a/py/defs.bzl b/py/defs.bzl
index b23ded39..49689784 100644
--- a/py/defs.bzl
+++ b/py/defs.bzl
@@ -134,7 +134,7 @@ def py_binary(name, srcs = [], main = None, **kwargs):
         **kwargs
     )
 
-def py_test(name, srcs = [], main = None, pytest_main = False, **kwargs):
+def py_test(name, srcs = [], main = None, pytest_main = False, tags = [], **kwargs):
     """Identical to [py_binary](./py_binary.md), but produces a target that can be used with `bazel test`.
 
     Args:
@@ -146,6 +146,7 @@ def py_test(name, srcs = [], main = None, pytest_main = False, **kwargs):
             that is used as the main.
         pytest_main: If set, generate a [py_pytest_main](#py_pytest_main) script and use it as the main.
             The deps should include the pytest package (as well as the coverage package if desired).
+        tags: If set, tags to be passed to generated targets (e.g. [py_pytest_main](#py_pytest_main)).
         **kwargs: additional named parameters to `py_binary_rule`.
     """
 
@@ -164,7 +165,7 @@ def py_test(name, srcs = [], main = None, pytest_main = False, **kwargs):
             fail("When pytest_main is set, the main attribute should not be set.")
         pytest_main_target = name + ".pytest_main"
         main = pytest_main_target + ".py"
-        py_pytest_main(name = pytest_main_target)
+        py_pytest_main(name = pytest_main_target, tags=tags)
         srcs.append(main)
         deps.append(pytest_main_target)
 
@@ -175,5 +176,6 @@ def py_test(name, srcs = [], main = None, pytest_main = False, **kwargs):
         deps = deps,
         main = main,
         resolutions = resolutions,
+		tags = tags,
         **kwargs
     )