diff --git a/.travis.yml b/.travis.yml
index 82d8316dda3..1f96c6fc006 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,13 +18,12 @@ env:
     - NUGET="mono nuget.exe"
   matrix:
     - CONFIG=opt TEST=sanity
-    - CONFIG=dbg TEST="c c++"
+    - CONFIG=gcov TEST="c c++"
     - CONFIG=opt TEST="c c++"
     - CONFIG=opt TEST=node
     - CONFIG=opt TEST=ruby
     - CONFIG=opt TEST=python
     - CONFIG=opt TEST=csharp
-    - CONFIG=gcov TEST="c c++"
     - USE_GCC=4.4 CONFIG=opt TEST=build
     - USE_GCC=4.5 CONFIG=opt TEST=build
 script:
diff --git a/Makefile b/Makefile
index d67ab17c614..991bed3b428 100644
--- a/Makefile
+++ b/Makefile
@@ -174,7 +174,7 @@ LD_gcov = gcc
 LDXX_gcov = g++
 CPPFLAGS_gcov = -O0 -fprofile-arcs -ftest-coverage
 LDFLAGS_gcov = -fprofile-arcs -ftest-coverage
-DEFINES_gcov = NDEBUG
+DEFINES_gcov = _DEBUG DEBUG
 
 
 # General settings.
diff --git a/templates/Makefile.template b/templates/Makefile.template
index fe455d1c208..9a12cf99226 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -188,7 +188,7 @@ LD_gcov = gcc
 LDXX_gcov = g++
 CPPFLAGS_gcov = -O0 -fprofile-arcs -ftest-coverage
 LDFLAGS_gcov = -fprofile-arcs -ftest-coverage
-DEFINES_gcov = NDEBUG
+DEFINES_gcov = _DEBUG DEBUG
 
 
 # General settings.