diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5683d412f0..9cc2bf74a4 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
+  #5890 #5898 #5901 #5906 #5899 #5907 #5909 #5922 #5926
   Contributed by @cognifloyd
 
 * Added a joint index to solve the problem of slow mongo queries for scheduled executions. #5805
diff --git a/contrib/runners/orquesta_runner/tests/unit/BUILD b/contrib/runners/orquesta_runner/tests/unit/BUILD
index f52633177d..772d9fbddb 100644
--- a/contrib/runners/orquesta_runner/tests/unit/BUILD
+++ b/contrib/runners/orquesta_runner/tests/unit/BUILD
@@ -11,4 +11,6 @@ python_tests(
     ],
 )
 
-python_sources()
+python_test_utils(
+    sources=["*.py", "!test_*.py"],
+)
diff --git a/st2client/tests/BUILD b/st2client/tests/BUILD
index abb3713743..9fffb418a0 100644
--- a/st2client/tests/BUILD
+++ b/st2client/tests/BUILD
@@ -4,4 +4,6 @@ __defaults__(
     )
 )
 
-python_sources()
+python_test_utils(
+    sources=["*.py"],
+)
diff --git a/st2common/tests/unit/BUILD b/st2common/tests/unit/BUILD
index 2373cbcd46..53db304442 100644
--- a/st2common/tests/unit/BUILD
+++ b/st2common/tests/unit/BUILD
@@ -12,4 +12,6 @@ python_tests(
     uses=["mongo", "rabbitmq"],
 )
 
-python_sources()
+python_test_utils(
+    sources=["*.py", "!test_*.py"],
+)
diff --git a/st2tests/integration/orquesta/BUILD b/st2tests/integration/orquesta/BUILD
index e2d2f13e20..5b6c97ec1f 100644
--- a/st2tests/integration/orquesta/BUILD
+++ b/st2tests/integration/orquesta/BUILD
@@ -1,6 +1,8 @@
-python_sources()
-
 python_tests(
     name="tests",
     uses=["redis"],
 )
+
+python_test_utils(
+    sources=["*.py", "!test_*.py"],
+)