diff --git a/test/cts/Android.bp b/test/cts/Android.bp
index 0cd13bd8e8f..2dd1a50f14b 100644
--- a/test/cts/Android.bp
+++ b/test/cts/Android.bp
@@ -61,7 +61,7 @@ cc_test {
         ":CtsPerfettoDebuggableApp",
         ":perfetto_device_preparer_sh",
     ],
-    stl: "libc++_static",
+    stl: "libc++",
     // This test is also run via Mainline Testing against the ART Mainline
     // Module, which is updatable since Android 12 (API level 31).
     // TODO(rsavitski): is this still necessary with the MTS tests split off into
diff --git a/test/cts/art_module/Android.bp b/test/cts/art_module/Android.bp
index eed99c0109b..078f0776ac2 100644
--- a/test/cts/art_module/Android.bp
+++ b/test/cts/art_module/Android.bp
@@ -56,7 +56,7 @@ cc_test {
         ":CtsPerfettoDebuggableApp",
         ":perfetto_device_preparer_sh",
     ],
-    stl: "libc++_static",
+    stl: "libc++",
     // This test is also run via Mainline Testing against the ART Mainline
     // Module, which is updatable since Android 12 (API level 31).
     min_sdk_version: "31",
diff --git a/test/cts/producer/jni/Android.bp b/test/cts/producer/jni/Android.bp
index 7961c4c2fbc..610a2861ba5 100644
--- a/test/cts/producer/jni/Android.bp
+++ b/test/cts/producer/jni/Android.bp
@@ -23,7 +23,7 @@ cc_library_shared {
     "liblog",
   ],
   compile_multilib: "both",
-  stl: "libc++_static",
+  stl: "libc++",
   defaults: [
     "perfetto_defaults",
   ],
diff --git a/test/cts/reporter/Android.bp b/test/cts/reporter/Android.bp
index c6e221ec6c8..e6c15f70f9a 100644
--- a/test/cts/reporter/Android.bp
+++ b/test/cts/reporter/Android.bp
@@ -52,7 +52,7 @@ cc_test {
   data: [
         ":CtsPerfettoReporterApp"
   ],
-  stl: "libc++_static",
+  stl: "libc++",
   defaults: [
     "perfetto_defaults",
   ],
diff --git a/test/cts/test_apps/jni/Android.bp b/test/cts/test_apps/jni/Android.bp
index dcbd9605e44..bd947d9b220 100644
--- a/test/cts/test_apps/jni/Android.bp
+++ b/test/cts/test_apps/jni/Android.bp
@@ -36,7 +36,7 @@ cc_library_shared {
     "liblog",
   ],
   compile_multilib: "both",
-  stl: "libc++_static",
+  stl: "libc++",
   defaults: [
     "perfetto_defaults",
   ],