diff --git a/.travis.yml b/.travis.yml
index 12019901..d0cb80e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,9 +79,17 @@ matrix:
       addons: *clang6
 
       # osx
-    - env: CLANG_VERSION=6.0 BUILD_TYPE=Release CPP=11 ASAN=Off TSAN=Off
+    - env: BUILD_TYPE=Release CPP=11 ASAN=Off TSAN=Off
       os: osx
 
+    - env: BUILD_TYPE=Debug CPP=11 ASAN=On TSAN=Off
+      os: osx
+
+    - env: BUILD_TYPE=Debug CPP=11 ASAN=Off TSAN=On
+      os: osx
+
+
+
 
 
 before_script:
diff --git a/tests/test_mpmc_q.cpp b/tests/test_mpmc_q.cpp
index 19c6cdf3..ddb31961 100644
--- a/tests/test_mpmc_q.cpp
+++ b/tests/test_mpmc_q.cpp
@@ -12,7 +12,7 @@ static milliseconds millis_from(const test_clock::time_point &tp0)
 TEST_CASE("dequeue-empty-nowait", "[mpmc_blocking_q]")
 {
     size_t q_size = 100;
-    milliseconds tolerance_wait(30);
+    milliseconds tolerance_wait(10);
     spdlog::details::mpmc_blocking_queue<int> q(q_size);
     int popped_item;
 
@@ -30,7 +30,7 @@ TEST_CASE("dequeue-empty-wait", "[mpmc_blocking_q]")
 
     size_t q_size = 100;
     milliseconds wait_ms(250);
-    milliseconds tolerance_wait(30);
+    milliseconds tolerance_wait(100);
 
     spdlog::details::mpmc_blocking_queue<int> q(q_size);
     int popped_item;
@@ -50,7 +50,7 @@ TEST_CASE("enqueue_nowait", "[mpmc_blocking_q]")
 
     size_t q_size = 1;
     spdlog::details::mpmc_blocking_queue<int> q(q_size);
-    milliseconds tolerance_wait(30);
+    milliseconds tolerance_wait(10);
 
     q.enqueue(1);
     REQUIRE(q.overrun_counter() == 0);