diff --git a/client/Android.mk b/client/Android.mk
index ef3409b..7bdfbb4 100644
--- a/client/Android.mk
+++ b/client/Android.mk
@@ -49,7 +49,7 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := libnativepower_tests
 ifdef BRILLO
-  LOCAL_MODULE_TAGS := debug
+  LOCAL_MODULE_TAGS := eng
 endif
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CFLAGS := $(libnativepower_CommonCFlags)
diff --git a/daemon/Android.mk b/daemon/Android.mk
index 170361c..17f8045 100644
--- a/daemon/Android.mk
+++ b/daemon/Android.mk
@@ -92,7 +92,7 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := nativepowerman_tests
 ifdef BRILLO
-  LOCAL_MODULE_TAGS := debug
+  LOCAL_MODULE_TAGS := eng
 endif
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CFLAGS := $(nativepowerman_CommonCFlags)