diff --git a/.travis.yml b/.travis.yml
index 17bd882e7c0..68097a8182b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,6 @@ env:
     - CONFIG=dbg TEST=c
     - CONFIG=dbg TEST=c++
     - CONFIG=asan TEST=c
-    - CONFIG=asan TEST=c++
-    - CONFIG=tsan TEST=c
-    - CONFIG=tsan TEST=c++
     - CONFIG=opt TEST=c
     - CONFIG=opt TEST=c++
     - CONFIG=opt TEST=node
diff --git a/build.json b/build.json
index 2079b2cce79..ff4c7fac06c 100644
--- a/build.json
+++ b/build.json
@@ -582,7 +582,8 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ]
+      ],
+      "flaky": true
     },
     {
       "name": "census_statistics_multiple_writers_test",
@@ -638,7 +639,8 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ]
+      ],
+      "flaky": true
     },
     {
       "name": "census_stats_store_test",
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 0413f19e44e..2e50e5d41ec 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -196,7 +196,7 @@ DEFINES += $(DEFINES_$(CONFIG)) INSTALL_PREFIX=\"$(prefix)\"
 LDFLAGS += $(LDFLAGS_$(CONFIG))
 
 ifdef EXTRA_DEFINES
-DEFINES += EXTRA_DEFINES
+DEFINES += $(EXTRA_DEFINES)
 endif
 
 CFLAGS += -std=c89 -pedantic
diff --git a/test/core/transport/chttp2/stream_map_test.c b/test/core/transport/chttp2/stream_map_test.c
index 6b91bdf14fd..d678e0af73f 100644
--- a/test/core/transport/chttp2/stream_map_test.c
+++ b/test/core/transport/chttp2/stream_map_test.c
@@ -213,7 +213,7 @@ int main(int argc, char **argv) {
   test_empty_find();
   test_double_deletion();
 
-  while (n < 10000000) {
+  while (n < 100000) {
     test_basic_add_find(n);
     test_delete_evens_sweep(n);
     test_delete_evens_incremental(n);
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index f84bd9dac9c..772856b9c7f 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -32,7 +32,7 @@
     "name": "census_hash_table_test"
   }, 
   {
-    "flaky": false, 
+    "flaky": true, 
     "language": "c", 
     "name": "census_statistics_multiple_writers_circular_buffer_test"
   }, 
@@ -52,7 +52,7 @@
     "name": "census_statistics_quick_test"
   }, 
   {
-    "flaky": false, 
+    "flaky": true, 
     "language": "c", 
     "name": "census_statistics_small_log_test"
   },