diff --git a/nsock/src/gh_list.h b/nsock/src/gh_list.h
index 91531b405..1d394d61d 100644
--- a/nsock/src/gh_list.h
+++ b/nsock/src/gh_list.h
@@ -69,7 +69,9 @@
 #include <assert.h>
 
 #define GH_LIST_MAGIC       0xBADFACE
+#ifndef GH_LIST_PARANOID
 #define GH_LIST_PARANOID    0
+#endif
 
 
 typedef struct gh_list_node {
diff --git a/nsock/tests/ghheaps.c b/nsock/tests/ghheaps.c
index d2e0cbdfc..0d4d2cb20 100644
--- a/nsock/tests/ghheaps.c
+++ b/nsock/tests/ghheaps.c
@@ -9,7 +9,7 @@
 #include <time.h>
 
 
-#define HEAP_COUNT  1
+#define HEAP_COUNT  3
 
 struct testitem {
   int val;
diff --git a/nsock/tests/ghlists.c b/nsock/tests/ghlists.c
index 923db5df6..f44502223 100644
--- a/nsock/tests/ghlists.c
+++ b/nsock/tests/ghlists.c
@@ -4,6 +4,8 @@
  */
 
 #include "test-common.h"
+/* Additional checks enabled */
+#define GH_LIST_PARANOID 1
 #include "../src/gh_list.h"
 /* For container_of */
 #include "../src/gh_heap.h"