diff --git a/ci/Android.bp b/ci/Android.bp
index 0dfbd37..2407c51 100644
--- a/ci/Android.bp
+++ b/ci/Android.bp
@@ -25,7 +25,7 @@
         "build_test_suites_test.py",
     ],
     libs: [
-        "build_test_suites",
+        "build_test_suites_lib",
         "pyfakefs",
         "ci_test_lib",
     ],
@@ -56,7 +56,7 @@
         "build_test_suites_local_test.py",
     ],
     libs: [
-        "build_test_suites",
+        "build_test_suites_lib",
         "pyfakefs",
         "ci_test_lib",
     ],
@@ -79,7 +79,7 @@
         "optimized_targets_test.py",
     ],
     libs: [
-        "build_test_suites",
+        "build_test_suites_lib",
         "pyfakefs",
     ],
     test_options: {
@@ -95,7 +95,7 @@
     },
 }
 
-python_library_host {
+python_binary_host {
     name: "build_test_suites",
     srcs: [
         "build_test_suites.py",
@@ -104,6 +104,26 @@
         "build_context.py",
         "test_discovery_agent.py",
     ],
+    main: "build_test_suites.py",
+    version: {
+        py3: {
+            embedded_launcher: true,
+        },
+    },
+    libs: [
+        "soong-metrics-proto-py",
+    ],
+}
+
+python_library_host {
+    name: "build_test_suites_lib",
+    srcs: [
+        "build_test_suites.py",
+        "optimized_targets.py",
+        "test_mapping_module_retriever.py",
+        "build_context.py",
+        "test_discovery_agent.py",
+    ],
 }
 
 python_library_host {
diff --git a/ci/build_test_suites.py b/ci/build_test_suites.py
index b8c4a38..9e56a20 100644
--- a/ci/build_test_suites.py
+++ b/ci/build_test_suites.py
@@ -209,3 +209,7 @@
         filename=log_file,
     )
   sys.exit(build_test_suites(argv))
+
+
+if __name__ == '__main__':
+  main(sys.argv[1:])