diff --git a/test/hidl_test/Android.mk b/test/hidl_test/Android.mk
index f328223..535c9dc 100644
--- a/test/hidl_test/Android.mk
+++ b/test/hidl_test/Android.mk
@@ -31,9 +31,10 @@
     hidl_test_helper \
     hidl_test_servers
 
-LOCAL_REQUIRED_MODULES_arm64 := hidl_test_servers_32 hidl_test_client_32
-LOCAL_REQUIRED_MODULES_mips64 := hidl_test_servers_32 hidl_test_client_32
-LOCAL_REQUIRED_MODULES_x86_64 := hidl_test_servers_32 hidl_test_client_32
+ifneq ($(TARGET_2ND_ARCH),)
+LOCAL_REQUIRED_MODULES += hidl_test_servers$(TARGET_2ND_ARCH_MODULE_SUFFIX)
+LOCAL_REQUIRED_MODULES += hidl_test_client$(TARGET_2ND_ARCH_MODULE_SUFFIX)
+endif
 
 include $(BUILD_PREBUILT)
 
diff --git a/test/java_test/Android.mk b/test/java_test/Android.mk
index a41fa5d..ec9eb93 100644
--- a/test/java_test/Android.mk
+++ b/test/java_test/Android.mk
@@ -28,8 +28,8 @@
     android.hidl.manager-V1.0-java              \
     android.hardware.tests.baz-V1.0-java
 
-LOCAL_REQUIRED_MODULES_arm64 := hidl_test_java_native_32
-LOCAL_REQUIRED_MODULES_x86_64 := hidl_test_java_native_32
-LOCAL_REQUIRED_MODULES_mips64 := hidl_test_java_native_32
+ifneq ($(TARGET_2ND_ARCH),)
+LOCAL_REQUIRED_MODULES += hidl_test_java_native$(TARGET_2ND_ARCH_MODULE_SUFFIX)
+endif
 
 include $(BUILD_PREBUILT)