diff --git a/cores/libretro-test/Makefile b/cores/libretro-test/Makefile
index 3049031b58..139af0290e 100644
--- a/cores/libretro-test/Makefile
+++ b/cores/libretro-test/Makefile
@@ -29,6 +29,17 @@ endif
 TARGET_NAME := test
 LIBM		= -lm
 
+ifeq ($(ARCHFLAGS),)
+   ARCHFLAGS = -arch i386 -arch x86_64
+endif
+
+ifeq ($(platform), osx)
+ifndef ($(NOUNIVERSAL))
+   CFLAGS += $(ARCHFLAGS)
+   LFLAGS += $(ARCHFLAGS)
+endif
+endif
+
 ifeq ($(platform), unix)
    TARGET := $(TARGET_NAME)_libretro.so
    fpic := -fPIC