diff --git a/st2common/tests/fixtures/BUILD b/st2common/tests/fixtures/BUILD
index 3ba6abf422..01dbde214a 100644
--- a/st2common/tests/fixtures/BUILD
+++ b/st2common/tests/fixtures/BUILD
@@ -1,5 +1,6 @@
 python_sources()
 
-shell_sources(
+st2_shell_sources_and_resources(
     name="shell",
+    sources=["*.sh"],
 )
diff --git a/st2common/tests/integration/BUILD b/st2common/tests/integration/BUILD
index 6587940ceb..275336dae7 100644
--- a/st2common/tests/integration/BUILD
+++ b/st2common/tests/integration/BUILD
@@ -5,19 +5,46 @@ __defaults__(
 
 python_tests(
     name="tests",
-    dependencies=[
-        # used by test_register_content_script
-        "conf/st2.tests.conf:st2_tests_conf",
-        "conf/st2.tests1.conf:st2_tests_conf",
-    ],
     stevedore_namespaces=[
         "orquesta.expressions.functions",
         "st2common.runners.runner",
         "st2common.rbac.backend",
         "st2common.metrics.driver",
     ],
+    uses=["mongo", "rabbitmq", "redis"],
+    overrides={
+        "test_logging.py": dict(
+            dependencies=[
+                "./log_unicode_data.py",
+            ],
+        ),
+        "test_register_content_script.py": dict(
+            dependencies=[
+                "conf/st2.tests.conf:st2_tests_conf",
+                "conf/st2.tests1.conf:st2_tests_conf",
+                "st2common/bin/st2-register-content",
+            ],
+        ),
+        "test_service_setup_log_level_filtering.py": dict(
+            dependencies=[
+                "st2api/bin/st2api",
+            ],
+        ),
+        "test_util_green.py": dict(
+            dependencies=[
+                "st2common/tests/fixtures/print_to_stdout_stderr_sleep.sh:shell_resources",
+            ],
+        ),
+    },
 )
 
 python_test_utils(
     sources=["*.py", "!test_*.py"],
+    overrides={
+        "log_unicode_data.py": dict(
+            dependencies=[
+                "st2tests/st2tests/fixtures/conf:st2.tests.conf",
+            ],
+        ),
+    },
 )