diff --git a/media/codec2/tests/Android.bp b/media/codec2/tests/Android.bp
index f54c039..5540f7b 100644
--- a/media/codec2/tests/Android.bp
+++ b/media/codec2/tests/Android.bp
@@ -1,13 +1,13 @@
 cc_test {
-    name: "codec2_param_test",
+    name: "codec2_core_param_test",
 
     srcs: [
         "C2Param_test.cpp",
     ],
 
     include_dirs: [
-        "hardware/google/av/codec2/include",
-        "hardware/google/av/codec2/vndk/include",
+        "frameworks/av/media/codec2/include",
+        "frameworks/av/media/codec2/vndk/include",
     ],
 
     // param tests must not depend on any codec2 libraries as all params should be templated
@@ -24,7 +24,7 @@
 }
 
 cc_test {
-    name: "codec2_test",
+    name: "codec2_vndk_test",
 
     srcs: [
         "C2_test.cpp",
@@ -37,10 +37,10 @@
     ],
 
     shared_libs: [
+        "libcodec2",
+        "libcodec2_vndk",
         "libcutils",
         "liblog",
-        "libstagefright_codec2",
-        "libstagefright_codec2_vndk",
         "libutils",
     ],
 
@@ -51,7 +51,7 @@
 }
 
 cc_test {
-    name: "codec2_interface_test",
+    name: "codec2_vndk_interface_test",
 
     srcs: [
         "C2ComponentInterface_test.cpp",
@@ -64,8 +64,8 @@
     shared_libs: [
         "libcutils",
         "liblog",
-        "libstagefright_codec2",
-        "libstagefright_codec2_vndk",
+        "libcodec2",
+        "libcodec2_vndk",
         "libutils",
     ],