diff --git a/tests/Android.mk b/tests/Android.mk
index 2e61d15..ab9d450 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -31,6 +31,11 @@
     libfmq
 LOCAL_CFLAGS := -Wall -Werror
 LOCAL_SHARED_LIBRARIES += android.hardware.tests.msgq@1.0
+
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)