diff --git a/.travis.yml b/.travis.yml
index 2708dcdcfb..7c621ac811 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,17 @@
 language: c
 sudo: false
 
-os:
-  - linux
-  - osx
-
-compiler:
- - gcc
- - clang
+matrix:
+  include:
+    - os: linux
+      compiler: gcc
+    - os: linux
+      compiler: clang
+    - os: osx
+      compiler: gcc
+      env: CONFIGURE_EXTRA=--with-sanitize=basic
+    - os: osx
+      compiler: clang
 
 env:
   global:
@@ -37,7 +41,7 @@ script:
          pip install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1 &&
          ./configure --disable-dependency-tracking --enable-coverage;
        else
-         ./configure --disable-dependency-tracking;
+         ./configure --disable-dependency-tracking $CONFIGURE_EXTRA;
        fi
      ) &&
      make -j4 &&
diff --git a/src/vifm.c b/src/vifm.c
index 1e20361b62..f900f4a0a9 100644
--- a/src/vifm.c
+++ b/src/vifm.c
@@ -333,13 +333,21 @@ vifm_main(int argc, char *argv[])
 		vle_aucmd_execute("DirEnter", flist_get_dir(&rwin), &rwin);
 	}
 
-	update_screen(UT_FULL);
-	modes_update();
-
 	/* Run startup commands after loading file lists into views, so that commands
 	 * like +1 work. */
+	if(window_shows_dirlist(&lwin))
+	{
+		(void)populate_dir_list(&lwin, 0);
+	}
+	if(window_shows_dirlist(&rwin))
+	{
+		(void)populate_dir_list(&rwin, 0);
+	}
 	exec_startup_commands(&vifm_args);
 
+	update_screen(UT_REDRAW);
+	modes_update();
+
 	curr_stats.load_stage = 3;
 
 	event_loop(&quit);
diff --git a/tests/Makefile b/tests/Makefile
index 2d38ce848d..f34dc56697 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -26,6 +26,7 @@
 #
 # make DEBUG=1 ...        -- builds debug version
 # make DEBUG=gdb ...      -- builds debug version and loads suite into gdb
+# make DEBUG=cgdb ...     -- builds debug version and loads suite into cgdb
 # make DEBUG=rr ...       -- builds debug version and loads suite into rr
 # make DEBUG=valgrind ... -- builds debug version and runs it under valgrind
 #                            (see valgrind-report file after a run)
@@ -189,6 +190,9 @@ ifdef DEBUG
     ifeq ($(DEBUG),gdb)
         TEST_RUN_PREFIX := gdb -q --args
     endif
+    ifeq ($(DEBUG),cgdb)
+        TEST_RUN_PREFIX := cgdb -- -q --args
+    endif
     ifeq ($(DEBUG),rr)
         TEST_RUN_PREFIX := rr record
     endif