diff --git a/Android.mk b/Android.mk
index e23c777..051bfe2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -67,6 +67,7 @@
 LOCAL_CFLAGS += -DUSER_SPACE
 LOCAL_CFLAGS += -DTA_DIR=\"/system/lib/optee_armtz\"
 LOCAL_CFLAGS += -pthread
+LOCAL_CFLAGS += -g3
 
 ## target BUILD_OPTEE_OS is defined in the common ta build
 ## mk file included before, and this BUILD_OPTEE_OS will
diff --git a/host/xtest/Makefile b/host/xtest/Makefile
index 7d987fb..2bd5ea2 100644
--- a/host/xtest/Makefile
+++ b/host/xtest/Makefile
@@ -133,6 +133,8 @@
 	  -Wno-missing-field-initializers -Wno-format-zero-length
 endif
 
+CFLAGS += -g3
+
 LDFLAGS += -L$(OPTEE_CLIENT_EXPORT)/lib -lteec
 LDFLAGS += -lpthread