diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b3720a22e0..0ed261e846 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -17,6 +17,7 @@ Added
   #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 #5929 #5930
+  #5931
   Contributed by @cognifloyd
 
 * Added a joint index to solve the problem of slow mongo queries for scheduled executions. #5805
diff --git a/st2actions/BUILD b/st2actions/BUILD
index aa69d5d336..25ff89bc8b 100644
--- a/st2actions/BUILD
+++ b/st2actions/BUILD
@@ -9,9 +9,9 @@ st2_component_python_distribution(
     ],
     dependencies=[
         # policies get wired up by metadata in st2common/st2common/policies/meta/*.yaml
-        "st2actions/policies",
+        "./st2actions/policies",
         # backwards compat API:
         # st2actions.runners.pythonrunner.Action moved to st2common.runners.base_action.Action
-        "st2actions/runners/pythonrunner.py",
+        "./st2actions/runners/pythonrunner.py",
     ],
 )
diff --git a/st2auth/tests/BUILD b/st2auth/tests/BUILD
index abb3713743..9fffb418a0 100644
--- a/st2auth/tests/BUILD
+++ b/st2auth/tests/BUILD
@@ -4,4 +4,6 @@ __defaults__(
     )
 )
 
-python_sources()
+python_test_utils(
+    sources=["*.py"],
+)
diff --git a/st2common/tests/integration/BUILD b/st2common/tests/integration/BUILD
index 8370137f9c..9daca7bc7b 100644
--- a/st2common/tests/integration/BUILD
+++ b/st2common/tests/integration/BUILD
@@ -3,8 +3,6 @@ __defaults__(
     extend=True,
 )
 
-python_sources()
-
 python_tests(
     name="tests",
     dependencies=[
@@ -13,3 +11,7 @@ python_tests(
         "conf/st2.tests1.conf:st2_tests_conf",
     ],
 )
+
+python_test_utils(
+    sources=["*.py", "!test_*.py"],
+)
diff --git a/st2stream/tests/unit/controllers/v1/BUILD b/st2stream/tests/unit/controllers/v1/BUILD
index 00e59b3017..a1ca2f641e 100644
--- a/st2stream/tests/unit/controllers/v1/BUILD
+++ b/st2stream/tests/unit/controllers/v1/BUILD
@@ -2,4 +2,6 @@ python_tests(
     name="tests",
 )
 
-python_sources()
+python_test_utils(
+    sources=["*.py", "!test_*.py"],
+)