diff --git a/firmware/test/Makefile b/firmware/test/Makefile
index 7384033a..d4c543a7 100644
--- a/firmware/test/Makefile
+++ b/firmware/test/Makefile
@@ -1,5 +1,17 @@
-CFLAGS=-g -Wall -I../src_simtrace -I../libcommon/include -I.
-LDFLAGS=-losmocore
+LIBOSMOCORE_CFLAGS=`pkg-config --cflags libosmocore`
+LIBOSMOCORE_LIBS=`pkg-config --libs libosmocore`
+
+CFLAGS=-g -Wall $(LIBOSMOCORE_CFLAGS) \
+	-I../src_simtrace \
+	-I../atmel_softpack_libraries/libchip_sam3s \
+	-I../atmel_softpack_libraries/libchip_sam3s/cmsis \
+	-I../atmel_softpack_libraries/libchip_sam3s/include \
+	-I../atmel_softpack_libraries/usb/include \
+	-I../libcommon/include \
+	-I../libboard/common/include \
+	-I../libboard/simtrace/include \
+	-I.
+LDFLAGS=$(LIBOSMOCORE_LIBS)
 
 VPATH=../src_simtrace ../libcommon/source