diff --git a/configure b/configure
index 86ba2f7c..331f29bd 100755
--- a/configure
+++ b/configure
@@ -45,7 +45,7 @@ fi
 # environment variables)
 CC=${CC:-cc}
 CXX=${CXX:-c++}
-CFLAGS=${CFLAGS:--O2}
+CFLAGS=${CFLAGS:--g -O2}
 CPPFLAGS=${CPPFLAGS:-}
 CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
 LDFLAGS=${LDFLAGS:-}
diff --git a/test/T000-basic.sh b/test/T000-basic.sh
index bf08f3e6..ef642457 100755
--- a/test/T000-basic.sh
+++ b/test/T000-basic.sh
@@ -92,7 +92,6 @@ test_expect_equal \
     "$(echo $PATH|cut -f1 -d: | sed -e 's,/test/valgrind/bin$,,')"
 
 test_begin_subtest 'notmuch is compiled with debugging symbols'
-test_subtest_known_broken
 readelf --sections $(which notmuch) | grep \.debug
 test_expect_equal 0 $?