diff --git a/test/Makefile.in b/test/Makefile.in
index 8e2335cc..0bbefb4f 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -6,7 +6,7 @@ ifeq ($(V),)
 endif
 
 CC=@CC@
-CPPFLAGS=@CPPFLAGS@ -DHIDE_EVENTER_ABI -I../src/utils -I../src -I../src/json-lib
+CPPFLAGS=-DHIDE_EVENTER_ABI -I../src/utils -I../src -I../src/json-lib @CPPFLAGS@
 CFLAGS=@CFLAGS@ @CFLAGSEXTRAS@ -Wno-error=unused-parameter
 LDFLAGS=@LDFLAGS@
 AR=@AR@
diff --git a/test/async-pingpong/test.c b/test/async-pingpong/test.c
index f2bb3c65..c77ba55f 100644
--- a/test/async-pingpong/test.c
+++ b/test/async-pingpong/test.c
@@ -1,17 +1,17 @@
-#include <mtev_defines.h>
-#include <mtev_conf.h>
-#include <mtev_console.h>
-#include <mtev_dso.h>
-#include <mtev_listener.h>
-#include <mtev_main.h>
-#include <mtev_memory.h>
-#include <mtev_rest.h>
-#include <mtev_capabilities_listener.h>
-#include <mtev_events_rest.h>
-#include <mtev_stats.h>
-#include <mtev_perftimer.h>
+#include "mtev_defines.h"
+#include "mtev_conf.h"
+#include "mtev_console.h"
+#include "mtev_dso.h"
+#include "mtev_listener.h"
+#include "mtev_main.h"
+#include "mtev_memory.h"
+#include "mtev_rest.h"
+#include "mtev_capabilities_listener.h"
+#include "mtev_events_rest.h"
+#include "mtev_stats.h"
+#include "mtev_perftimer.h"
 #include <circllhist.h>
-#include <eventer/eventer.h>
+#include "eventer/eventer.h"
 #include <inttypes.h>
 
 #include <stdio.h>
diff --git a/test/dyn_buffer_test.c b/test/dyn_buffer_test.c
index 0ee9ddd6..225fd095 100644
--- a/test/dyn_buffer_test.c
+++ b/test/dyn_buffer_test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include <mtev_dyn_buffer.h>
+#include "mtev_dyn_buffer.h"
 
 int chkmem(mtev_dyn_buffer_t *buff, size_t len, char exp) {
   const char *cp;
diff --git a/test/flowreg/test.c b/test/flowreg/test.c
index 8bc01536..e2df2c27 100644
--- a/test/flowreg/test.c
+++ b/test/flowreg/test.c
@@ -1,14 +1,14 @@
-#include <mtev_capabilities_listener.h>
-#include <mtev_conf.h>
-#include <mtev_console.h>
-#include <mtev_defines.h>
-#include <mtev_dso.h>
-#include <mtev_flow_regulator.h>
-#include <mtev_listener.h>
-#include <mtev_main.h>
-#include <mtev_memory.h>
-#include <mtev_stats.h>
-#include <eventer/eventer.h>
+#include "mtev_capabilities_listener.h"
+#include "mtev_conf.h"
+#include "mtev_console.h"
+#include "mtev_defines.h"
+#include "mtev_dso.h"
+#include "mtev_flow_regulator.h"
+#include "mtev_listener.h"
+#include "mtev_main.h"
+#include "mtev_memory.h"
+#include "mtev_stats.h"
+#include "eventer/eventer.h"
 #include <inttypes.h>
 
 #include <getopt.h>
diff --git a/test/frrh_test.c b/test/frrh_test.c
index 7177725f..ece7785a 100644
--- a/test/frrh_test.c
+++ b/test/frrh_test.c
@@ -1,7 +1,7 @@
-#include <mtev_defines.h>
-#include <mtev_memory.h>
-#include <mtev_frrh.h>
-#include <mtev_perftimer.h>
+#include "mtev_defines.h"
+#include "mtev_memory.h"
+#include "mtev_frrh.h"
+#include "mtev_perftimer.h"
 #include <openssl/sha.h>
 #include <openssl/evp.h>
 
diff --git a/test/geturllz4f.c b/test/geturllz4f.c
index 291bc608..f6325b2e 100644
--- a/test/geturllz4f.c
+++ b/test/geturllz4f.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
-#include <mtev_defines.h>
-#include <mtev_compress.h>
+#include "mtev_defines.h"
+#include "mtev_compress.h"
 #include <curl/curl.h>
 
 static size_t print_data(void *buff, size_t s, size_t n, void *vd) {
diff --git a/test/hash_test.c b/test/hash_test.c
index 3b5705d0..be100c00 100644
--- a/test/hash_test.c
+++ b/test/hash_test.c
@@ -1,4 +1,4 @@
-#include <mtev_hash.h>
+#include "mtev_hash.h"
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test/hll_test.c b/test/hll_test.c
index 3735887e..6e818cbc 100644
--- a/test/hll_test.c
+++ b/test/hll_test.c
@@ -1,5 +1,5 @@
-#include <mtev_hyperloglog.h>
-#include <mtev_time.h>
+#include "mtev_hyperloglog.h"
+#include "mtev_time.h"
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/huge_hash_test.c b/test/huge_hash_test.c
index 3561fc9d..3017c09d 100644
--- a/test/huge_hash_test.c
+++ b/test/huge_hash_test.c
@@ -1,4 +1,4 @@
-#include <mtev_huge_hash.h>
+#include "mtev_huge_hash.h"
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test/lfu_test.c b/test/lfu_test.c
index d6977494..b57ed0c3 100644
--- a/test/lfu_test.c
+++ b/test/lfu_test.c
@@ -1,5 +1,5 @@
-#include <mtev_lfu.h>
-#include <mtev_time.h>
+#include "mtev_lfu.h"
+#include "mtev_time.h"
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/lru_test.c b/test/lru_test.c
index 17de87db..6a1aba85 100644
--- a/test/lru_test.c
+++ b/test/lru_test.c
@@ -1,5 +1,5 @@
-#include <mtev_lru.h>
-#include <mtev_time.h>
+#include "mtev_lru.h"
+#include "mtev_time.h"
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/maybe_alloc_test.c b/test/maybe_alloc_test.c
index f61bc8a6..fbc125ea 100644
--- a/test/maybe_alloc_test.c
+++ b/test/maybe_alloc_test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include <mtev_maybe_alloc.h>
+#include "mtev_maybe_alloc.h"
 
 int chkmem(const char *ptr, size_t len, char exp) {
   const char *cp;
diff --git a/test/pool-shift-async/test.c b/test/pool-shift-async/test.c
index 62d7fd90..66b48cc7 100644
--- a/test/pool-shift-async/test.c
+++ b/test/pool-shift-async/test.c
@@ -1,15 +1,15 @@
-#include <mtev_defines.h>
-#include <mtev_conf.h>
-#include <mtev_console.h>
-#include <mtev_dso.h>
-#include <mtev_listener.h>
-#include <mtev_main.h>
-#include <mtev_memory.h>
-#include <mtev_rest.h>
-#include <mtev_capabilities_listener.h>
-#include <mtev_events_rest.h>
-#include <mtev_stats.h>
-#include <eventer/eventer.h>
+#include "mtev_defines.h"
+#include "mtev_conf.h"
+#include "mtev_console.h"
+#include "mtev_dso.h"
+#include "mtev_listener.h"
+#include "mtev_main.h"
+#include "mtev_memory.h"
+#include "mtev_rest.h"
+#include "mtev_capabilities_listener.h"
+#include "mtev_events_rest.h"
+#include "mtev_stats.h"
+#include "eventer/eventer.h"
 #include <inttypes.h>
 
 #include <stdio.h>
diff --git a/test/sort_test.c b/test/sort_test.c
index d072f803..e6e0befb 100644
--- a/test/sort_test.c
+++ b/test/sort_test.c
@@ -1,5 +1,5 @@
-#include <mtev_sort.h>
-#include <mtev_time.h>
+#include "mtev_sort.h"
+#include "mtev_time.h"
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/speculatelog_test.c b/test/speculatelog_test.c
index 97d165e8..69eb1f70 100644
--- a/test/speculatelog_test.c
+++ b/test/speculatelog_test.c
@@ -1,5 +1,5 @@
-#include <mtev_defines.h>
-#include <mtev_log.h>
+#include "mtev_defines.h"
+#include "mtev_log.h"
 #include <stdio.h>
 
 int main(int argc, char *argv[])
diff --git a/test/subqueues/test.c b/test/subqueues/test.c
index 65844263..4021b6c9 100644
--- a/test/subqueues/test.c
+++ b/test/subqueues/test.c
@@ -1,14 +1,14 @@
-#include <mtev_capabilities_listener.h>
-#include <mtev_conf.h>
-#include <mtev_console.h>
-#include <mtev_defines.h>
-#include <mtev_dso.h>
-#include <mtev_listener.h>
-#include <mtev_main.h>
-#include <mtev_memory.h>
-#include <mtev_stats.h>
-#include <mtev_perftimer.h>
-#include <eventer/eventer.h>
+#include "mtev_capabilities_listener.h"
+#include "mtev_conf.h"
+#include "mtev_console.h"
+#include "mtev_defines.h"
+#include "mtev_dso.h"
+#include "mtev_listener.h"
+#include "mtev_main.h"
+#include "mtev_memory.h"
+#include "mtev_stats.h"
+#include "mtev_perftimer.h"
+#include "eventer/eventer.h"
 #include <inttypes.h>
 #include <ck_pr.h>
 
diff --git a/test/test_http_server.c b/test/test_http_server.c
index 650a1427..6c91dfb1 100644
--- a/test/test_http_server.c
+++ b/test/test_http_server.c
@@ -1,16 +1,16 @@
-#include <mtev_defines.h>
-#include <mtev_conf.h>
-#include <mtev_console.h>
-#include <mtev_dso.h>
-#include <mtev_listener.h>
-#include <mtev_main.h>
-#include <mtev_memory.h>
-#include <mtev_http.h>
-#include <mtev_rest.h>
-#include <mtev_cluster.h>
-#include <mtev_capabilities_listener.h>
-#include <mtev_events_rest.h>
-#include <eventer/eventer.h>
+#include "mtev_defines.h"
+#include "mtev_conf.h"
+#include "mtev_console.h"
+#include "mtev_dso.h"
+#include "mtev_listener.h"
+#include "mtev_main.h"
+#include "mtev_memory.h"
+#include "mtev_http.h"
+#include "mtev_rest.h"
+#include "mtev_cluster.h"
+#include "mtev_capabilities_listener.h"
+#include "mtev_events_rest.h"
+#include "eventer/eventer.h"
 #include "mtev_stacktrace.h"
 
 #include <errno.h>
@@ -128,6 +128,9 @@ static int my_post_handler(mtev_http_rest_closure_t *restc, int npats, char **pa
   return EVENTER_READ | EVENTER_WRITE | EVENTER_EXCEPTION;
 }
 static int my_safe_handler(mtev_http_rest_closure_t *restc, int npats, char **pats) {
+  (void)npats;
+  (void)pats;
+
   mtev_http_session_ctx *ctx = restc->http_ctx;
   mtev_http_response_standard(ctx, 200, "OK", "text/plain");
   mtev_http_response_append_str(ctx, "contents\n");
diff --git a/test/time_test.c b/test/time_test.c
index bc6fcc56..904efcfd 100644
--- a/test/time_test.c
+++ b/test/time_test.c
@@ -1,5 +1,5 @@
-#include <mtev_time.h>
-#include <mtev_thread.h>
+#include "mtev_time.h"
+#include "mtev_thread.h"
 #include <pthread.h>
 #include <stdio.h>
 #include <stdint.h>
diff --git a/test/uuid_test.c b/test/uuid_test.c
index 071f8822..a4c8ab18 100644
--- a/test/uuid_test.c
+++ b/test/uuid_test.c
@@ -1,6 +1,6 @@
 #include <uuid/uuid.h>
-#include <mtev_uuid.h>
-#include <mtev_time.h>
+#include "mtev_uuid.h"
+#include "mtev_time.h"
 #include <pthread.h>
 #include <stdio.h>
 #include <stdint.h>