diff --git a/.travis.yml b/.travis.yml
index e4b4774..56b6e1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,9 @@ matrix:
     - compiler: gcc
       env: CONFIGURE_OPTION='--enable-debug --with-malloc=jemalloc' COVERALLS=yes VALGRIND=no
     - compiler: gcc
-      env: CONFIGURE_OPTION='--enable-debug --with-malloc=jemalloc' COVERALLS=yes VALGRIND=yes LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/
+      env: CONFIGURE_OPTION='--enable-debug' COVERALLS=yes VALGRIND=yes LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/
+    - compiler: clang
+      env: ASAN_OPTIONS=symbolize=1 ASAN_SYMBOLIZER_PATH=/usr/local/clang-3.4/bin/llvm-symbolizer CFLAGS='-fsanitize=address -g -O1'
 
 install:
   - sudo apt-get update -qq
@@ -23,9 +25,9 @@ before_script:
 script:
   - ./autogen.sh
   - ./configure $CONFIGURE_OPTION
-  - make
+  - make V=1
   - sudo make install
-  - if [ "x$VALGRIND" == xyes ]; then make check > /dev/null 2>&1; else make check; fi
+  - if [ "x$VALGRIND" == xyes ]; then make check > /dev/null 2>&1; else make check V=1; fi
   - if [ "x$VALGRIND" == xyes ]; then valgrind ./tests/.libs/* -v --trace-children=yes --show-leak-kinds=full --leak-check=full; fi
 
 after_success:
diff --git a/tests/check_slug.c b/tests/check_slug.c
index 2662981..1453fd2 100644
--- a/tests/check_slug.c
+++ b/tests/check_slug.c
@@ -98,6 +98,7 @@ END_TEST
 Suite* r3_suite (void) {
         Suite *suite = suite_create("slug test");
         TCase *tcase = tcase_create("test_slug");
+        tcase_set_timeout(tcase, 30);
         tcase_add_test(tcase, test_contains_slug);
         tcase_add_test(tcase, test_inside_slug);
         tcase_add_test(tcase, test_find_slug_pattern);
diff --git a/tests/check_tree.c b/tests/check_tree.c
index c3d97fa..36885f2 100644
--- a/tests/check_tree.c
+++ b/tests/check_tree.c
@@ -363,6 +363,7 @@ Suite* r3_suite (void) {
         Suite *suite = suite_create("blah");
 
         TCase *tcase = tcase_create("testcase");
+        tcase_set_timeout(tcase, 30);
         tcase_add_test(tcase, test_r3_node_construct_and_free);
         tcase_add_test(tcase, test_str_array);
         tcase_add_test(tcase, test_ltrim_slash);