diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index d1c8351bd..b860db983 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -92,4 +92,5 @@ cc_test {
         "libnativeloader-headers",
     ],
     system_shared_libs: ["libc", "libm"],
+    test_suites: ["device-tests"],
 }
diff --git a/libnativeloader/TEST_MAPPING b/libnativeloader/TEST_MAPPING
new file mode 100644
index 000000000..7becb7791
--- /dev/null
+++ b/libnativeloader/TEST_MAPPING
@@ -0,0 +1,12 @@
+{
+  "presubmit": [
+    {
+      "name": "libnativeloader_test"
+    }
+  ],
+  "imports": [
+    {
+      "path": "cts/tests/tests/jni"
+    }
+  ]
+}
diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp
index 9648aad8b..614188b27 100644
--- a/libnativeloader/native_loader_test.cpp
+++ b/libnativeloader/native_loader_test.cpp
@@ -336,7 +336,7 @@ class NativeLoaderTest_Create : public NativeLoaderTest {
   std::string expected_parent_namespace = "platform";
   bool expected_link_with_platform_ns = true;
   bool expected_link_with_runtime_ns = true;
-  bool expected_link_with_sphal_ns = true;
+  bool expected_link_with_sphal_ns = !vendor_public_libraries().empty();
   bool expected_link_with_vndk_ns = false;
   bool expected_link_with_default_ns = false;
   std::string expected_shared_libs_to_platform_ns = default_public_libraries();