diff --git a/device.mk b/device.mk
index 718576dc..1aa10d4f 100755
--- a/device.mk
+++ b/device.mk
@@ -419,11 +419,17 @@ PRODUCT_PACKAGES += \
     camera.device@3.2-impl \
     camera.msm8998 \
     libgooglecamerahal \
-    libgoogle_camera_hal_tests \
     libqomx_core \
     libmmjpeg_interface \
     libmmcamera_interface
 
+# Google Camera HAL test libraries in debug builds
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES += \
+    libgoogle_camera_hal_proprietary_tests \
+    libgoogle_camera_hal_tests
+endif
+
 PRODUCT_PACKAGES += \
     sensors.$(PRODUCT_HARDWARE) \
     android.hardware.sensors@1.0-impl:64 \