diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 151a9fcbcf..0ce7f48010 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -16,7 +16,7 @@ Added
   to pants' use of PEX lockfiles. This is not a user-facing addition.
   #5778 #5789 #5817 #5795 #5830 #5833 #5834 #5841 #5840 #5838 #5842 #5837 #5849 #5850
   #5846 #5853 #5848 #5847 #5858 #5857 #5860 #5868 #5871 #5864 #5874 #5884 #5893 #5891
-  #5890 #5898 #5901 #5906 #5899 #5907 #5909 #5922 #5926 #5927 #5925 #5928
+  #5890 #5898 #5901 #5906 #5899 #5907 #5909 #5922 #5926 #5927 #5925 #5928 #5929
   Contributed by @cognifloyd
 
 * Added a joint index to solve the problem of slow mongo queries for scheduled executions. #5805
diff --git a/st2actions/tests/unit/test_actions_registrar.py b/st2actions/tests/unit/test_actions_registrar.py
index 0f3fe76e32..8afe963908 100644
--- a/st2actions/tests/unit/test_actions_registrar.py
+++ b/st2actions/tests/unit/test_actions_registrar.py
@@ -29,6 +29,7 @@
 from st2tests.fixtures.generic.fixture import (
     PACK_NAME as GENERIC_PACK,
     PACK_PATH as GENERIC_PACK_PATH,
+    PACK_BASE_PATH as PACKS_BASE_PATH,
 )
 import st2tests.fixturesloader as fixtures_loader
 
@@ -52,9 +53,8 @@ class ActionsRegistrarTest(tests_base.DbTestCase):
     )
     def test_register_all_actions(self):
         try:
-            packs_base_path = fixtures_loader.get_fixtures_base_path()
             all_actions_in_db = Action.get_all()
-            actions_registrar.register_actions(packs_base_paths=[packs_base_path])
+            actions_registrar.register_actions(packs_base_paths=[PACKS_BASE_PATH])
         except Exception as e:
             print(six.text_type(e))
             self.fail("All actions must be registered without exceptions.")
diff --git a/st2common/tests/unit/BUILD b/st2common/tests/unit/BUILD
index 53db304442..097775214f 100644
--- a/st2common/tests/unit/BUILD
+++ b/st2common/tests/unit/BUILD
@@ -10,6 +10,14 @@ python_tests(
         "st2common/tests/unit/base.py",
     ],
     uses=["mongo", "rabbitmq"],
+    overrides={
+        "test_util_file_system.py": dict(
+            dependencies=[
+                "st2tests/st2tests/policies",
+                "st2tests/st2tests/policies/meta",
+            ],
+        ),
+    },
 )
 
 python_test_utils(
diff --git a/st2tests/BUILD b/st2tests/BUILD
index a6188b03a9..11532f1cec 100644
--- a/st2tests/BUILD
+++ b/st2tests/BUILD
@@ -1,3 +1,33 @@
 st2_component_python_distribution(
     component_name="st2tests",
+    dependencies=[
+        "./st2tests/policies",
+        "./st2tests/policies/meta",
+        "./st2tests/mocks",
+        "./st2tests/mocks/runners",
+        # fixture packs
+        "./st2tests/fixtures/generic",
+        "./st2tests/fixtures/localrunner_pack",
+        "./st2tests/fixtures/packs:all_packs",
+        "./st2tests/fixtures/packs_1:all_packs",
+        "./st2tests/fixtures/packs_invalid:all_packs",
+        # fixtures in packs that are not (directly) packs
+        "./st2tests/fixtures/packs/executions",
+        "./st2tests/fixtures/packs/runners",
+        "./st2tests/fixtures/packs/test_content_version_fixture",  # provides fixture const
+        # fixture db resources (eg yaml dump of db resources)
+        "./st2tests/fixtures/aliases",
+        "./st2tests/fixtures/backstop",
+        "./st2tests/fixtures/descendants",
+        "./st2tests/fixtures:rbac_fixtures",
+        "./st2tests/fixtures/rule_enforcements",
+        "./st2tests/fixtures/timers",
+        "./st2tests/fixtures/traces",
+        # fixture etc
+        "./st2tests/fixtures/conf",
+        "./st2tests/fixtures/history_views",
+        "./st2tests/fixtures/keyczar_keys",
+        "./st2tests/fixtures/specs",
+        "./st2tests/fixtures/ssl_certs",
+    ],
 )
diff --git a/st2tests/st2tests/BUILD b/st2tests/st2tests/BUILD
index bdd44d7ac9..48ce6bcf8d 100644
--- a/st2tests/st2tests/BUILD
+++ b/st2tests/st2tests/BUILD
@@ -3,6 +3,7 @@ python_sources(
         "st2tests/conf:st2.conf",
         "st2tests/conf:st2_kvstore_tests.crypto.key.json",
         "st2tests/conf:logging.conf",
+        # These are for base.py, but do not use overrides because __init__ import base.
         "./resources:ssh",
         "./resources:packs",
     ],
diff --git a/st2tests/st2tests/fixtures/generic/fixture.py b/st2tests/st2tests/fixtures/generic/fixture.py
index 50c698989e..b5b68ddc3b 100644
--- a/st2tests/st2tests/fixtures/generic/fixture.py
+++ b/st2tests/st2tests/fixtures/generic/fixture.py
@@ -14,3 +14,4 @@
 from st2tests import fixturesloader
 
 PACK_NAME, PACK_PATH = fixturesloader.get_fixture_name_and_path(__file__)
+PACK_BASE_PATH = fixturesloader.get_fixtures_base_path()
diff --git a/st2tests/st2tests/fixtures/localrunner_pack/BUILD b/st2tests/st2tests/fixtures/localrunner_pack/BUILD
index 99d651ce3c..55bc03c748 100644
--- a/st2tests/st2tests/fixtures/localrunner_pack/BUILD
+++ b/st2tests/st2tests/fixtures/localrunner_pack/BUILD
@@ -3,5 +3,8 @@ pack_metadata(
 )
 
 python_sources(
-    dependencies=[":metadata"],
+    dependencies=[
+        ":metadata",
+        "./actions",
+    ],
 )
diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD
index c10f509354..21dc137562 100644
--- a/st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD
+++ b/st2tests/st2tests/fixtures/packs/dummy_pack_1/BUILD
@@ -5,6 +5,9 @@ pack_metadata(
 python_sources(
     dependencies=[
         ":metadata",
+        "./actions",
+        "./sensors",
+        "./etc",  # extra binary files for st2api/tests/unit/controllers/v1/test_packs_views.py
         "st2tests/st2tests/fixtures/packs/configs/dummy_pack_1.yaml",
     ],
 )
diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_1/etc/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_1/etc/BUILD
new file mode 100644
index 0000000000..d7a6049c15
--- /dev/null
+++ b/st2tests/st2tests/fixtures/packs/dummy_pack_1/etc/BUILD
@@ -0,0 +1,3 @@
+resources(
+    sources=["*.png"],
+)
diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD
index 410ec9f74b..186ad11df7 100644
--- a/st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD
+++ b/st2tests/st2tests/fixtures/packs/dummy_pack_2/BUILD
@@ -1,5 +1,6 @@
 pack_metadata(
     name="metadata",
+    dependencies=[":pack_requirements"],
 )
 
 resource(
@@ -8,5 +9,9 @@ resource(
 )
 
 python_sources(
-    dependencies=[":metadata"],
+    dependencies=[
+        ":metadata",
+        "./actions",
+        "./sensors",
+    ],
 )
diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD
index 99d651ce3c..0e8f7dfc0b 100644
--- a/st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD
+++ b/st2tests/st2tests/fixtures/packs/dummy_pack_3/BUILD
@@ -3,5 +3,9 @@ pack_metadata(
 )
 
 python_sources(
-    dependencies=[":metadata"],
+    dependencies=[
+        ":metadata",
+        "./actions",
+        "./sensors",
+    ],
 )
diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD
index 9549df1e2a..766c524981 100644
--- a/st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD
+++ b/st2tests/st2tests/fixtures/packs/dummy_pack_7/BUILD
@@ -5,6 +5,7 @@ pack_metadata(
 python_sources(
     dependencies=[
         ":metadata",
+        "./actions",
         "st2tests/st2tests/fixtures/packs/configs/dummy_pack_7.yaml",
     ],
 )
diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD b/st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD
index 99d651ce3c..55bc03c748 100644
--- a/st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD
+++ b/st2tests/st2tests/fixtures/packs/dummy_pack_9/BUILD
@@ -3,5 +3,8 @@ pack_metadata(
 )
 
 python_sources(
-    dependencies=[":metadata"],
+    dependencies=[
+        ":metadata",
+        "./actions",
+    ],
 )
diff --git a/st2tests/st2tests/fixtures/packs/dummy_pack_9/actions/invalid_syntax.py b/st2tests/st2tests/fixtures/packs/dummy_pack_9/actions/invalid_syntax.py
index acd2832627..b10f7922ca 100644
--- a/st2tests/st2tests/fixtures/packs/dummy_pack_9/actions/invalid_syntax.py
+++ b/st2tests/st2tests/fixtures/packs/dummy_pack_9/actions/invalid_syntax.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-from invalid import Invalid  # noqa
+from invalid import Invalid  # noqa # pants: no-infer-dep
 
 
 class Foo:
diff --git a/st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD b/st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD
index 99d651ce3c..55bc03c748 100644
--- a/st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD
+++ b/st2tests/st2tests/fixtures/packs/orquesta_tests/BUILD
@@ -3,5 +3,8 @@ pack_metadata(
 )
 
 python_sources(
-    dependencies=[":metadata"],
+    dependencies=[
+        ":metadata",
+        "./actions",
+    ],
 )
diff --git a/st2tests/st2tests/fixtures/packs/pack_invalid_requirements/BUILD b/st2tests/st2tests/fixtures/packs/pack_invalid_requirements/BUILD
index 410ec9f74b..665adf5413 100644
--- a/st2tests/st2tests/fixtures/packs/pack_invalid_requirements/BUILD
+++ b/st2tests/st2tests/fixtures/packs/pack_invalid_requirements/BUILD
@@ -1,5 +1,6 @@
 pack_metadata(
     name="metadata",
+    dependencies=[":pack_requirements"],
 )
 
 resource(
diff --git a/st2tests/st2tests/fixtures/packs/runners/BUILD b/st2tests/st2tests/fixtures/packs/runners/BUILD
index db46e8d6c9..2dde3b88eb 100644
--- a/st2tests/st2tests/fixtures/packs/runners/BUILD
+++ b/st2tests/st2tests/fixtures/packs/runners/BUILD
@@ -1 +1,6 @@
-python_sources()
+python_sources(
+    dependencies=[
+        "./test_async_runner",
+        "./test_polling_async_runner",
+    ],
+)
diff --git a/st2tests/st2tests/fixtures/packs/runners/test_async_runner/BUILD b/st2tests/st2tests/fixtures/packs/runners/test_async_runner/BUILD
index 57341b1358..9f2acdfa08 100644
--- a/st2tests/st2tests/fixtures/packs/runners/test_async_runner/BUILD
+++ b/st2tests/st2tests/fixtures/packs/runners/test_async_runner/BUILD
@@ -1,3 +1,3 @@
-python_tests(
-    name="tests",
+python_sources(
+    sources=["*.py"],
 )
diff --git a/st2tests/st2tests/fixtures/packs/runners/test_polling_async_runner/BUILD b/st2tests/st2tests/fixtures/packs/runners/test_polling_async_runner/BUILD
index 57341b1358..9f2acdfa08 100644
--- a/st2tests/st2tests/fixtures/packs/runners/test_polling_async_runner/BUILD
+++ b/st2tests/st2tests/fixtures/packs/runners/test_polling_async_runner/BUILD
@@ -1,3 +1,3 @@
-python_tests(
-    name="tests",
+python_sources(
+    sources=["*.py"],
 )
diff --git a/st2tests/st2tests/fixtures/packs/test_library_dependencies/BUILD b/st2tests/st2tests/fixtures/packs/test_library_dependencies/BUILD
index 410ec9f74b..0c82bded50 100644
--- a/st2tests/st2tests/fixtures/packs/test_library_dependencies/BUILD
+++ b/st2tests/st2tests/fixtures/packs/test_library_dependencies/BUILD
@@ -1,5 +1,6 @@
 pack_metadata(
     name="metadata",
+    dependencies=[":pack_requirements"],
 )
 
 resource(
@@ -8,5 +9,8 @@ resource(
 )
 
 python_sources(
-    dependencies=[":metadata"],
+    dependencies=[
+        ":metadata",
+        "./actions",
+    ],
 )
diff --git a/st2tests/st2tests/fixtures/specs/BUILD b/st2tests/st2tests/fixtures/specs/BUILD
index 090f612588..bf3087a465 100644
--- a/st2tests/st2tests/fixtures/specs/BUILD
+++ b/st2tests/st2tests/fixtures/specs/BUILD
@@ -2,3 +2,9 @@ resource(
     name="openapi_specs",
     source="openapi.yaml.j2",
 )
+
+# This is for an empty __init__.py file.
+# Tests will import __package__ from it to tell dep inference it is needed.
+python_sources(
+    dependencies=[":openapi_specs"],
+)
diff --git a/st2tests/st2tests/fixtures/ssl_certs/BUILD b/st2tests/st2tests/fixtures/ssl_certs/BUILD
index d5c05d1ede..8ad3f13509 100644
--- a/st2tests/st2tests/fixtures/ssl_certs/BUILD
+++ b/st2tests/st2tests/fixtures/ssl_certs/BUILD
@@ -7,6 +7,7 @@ resources(
         "**/*.pem",
         "ca/index.txt*",
         "ca/serial*",
+        "README.md",
     ],
 )
 
diff --git a/st2tests/st2tests/policies/meta/BUILD b/st2tests/st2tests/policies/meta/BUILD
index 20f3688a97..0700f34cd5 100644
--- a/st2tests/st2tests/policies/meta/BUILD
+++ b/st2tests/st2tests/policies/meta/BUILD
@@ -1,4 +1,3 @@
 resources(
-    name="policies_meta",
     sources=["*.yaml"],
 )