diff --git a/aos/linux_code/ipc_lib/ipc_lib.gyp b/aos/linux_code/ipc_lib/ipc_lib.gyp
index fe8b2e0..68cd13b 100644
--- a/aos/linux_code/ipc_lib/ipc_lib.gyp
+++ b/aos/linux_code/ipc_lib/ipc_lib.gyp
@@ -46,6 +46,26 @@
         'core_lib',
         '<(AOS)/build/aos.gyp:logging_interface',
       ],
+      'defines': [
+        'QUEUE_DEBUG=0',
+      ],
+    },
+    # A version of the queue code compiled with assertions enabled etc.
+    {
+      'target_name': 'queue_debug',
+      'type': 'static_library',
+      'sources': [
+        'queue.cc',
+      ],
+      'dependencies': [
+        'queue',
+      ],
+      'export_dependent_settings': [
+        'queue',
+      ],
+      'defines': [
+        'QUEUE_DEBUG=1',
+      ],
     },
     {
       'target_name': 'raw_queue_test',
@@ -55,7 +75,7 @@
       ],
       'dependencies': [
         '<(EXTERNALS):gtest',
-        'queue',
+        'queue_debug',
         '<(AOS)/build/aos.gyp:logging',
         'core_lib',
         '<(AOS)/common/common.gyp:queue_testutils',
diff --git a/aos/linux_code/ipc_lib/queue.cc b/aos/linux_code/ipc_lib/queue.cc
index 81af416..ab117d1 100644
--- a/aos/linux_code/ipc_lib/queue.cc
+++ b/aos/linux_code/ipc_lib/queue.cc
@@ -1,3 +1,7 @@
+#if !QUEUE_DEBUG
+#define NDEBUG
+#endif
+
 #include "aos/linux_code/ipc_lib/queue.h"
 
 #include <stdio.h>
@@ -12,9 +16,6 @@
 #include "aos/common/type_traits.h"
 #include "aos/linux_code/ipc_lib/core_lib.h"
 
-#undef assert
-#define assert(...)
-
 namespace aos {
 namespace {