diff --git a/configure.ac b/configure.ac
index 8a5992f8cb45..9c1f9e099abb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5313,7 +5313,7 @@ ENABLE_OPTIMIZED=
 ENABLE_OPTIMIZED_DEBUG=
 AC_MSG_CHECKING([whether to compile with optimization flags])
 if test -z "$enable_optimized"; then
-    if test -n "$ENABLE_DEBUG$ENABLE_DBGUTIL"; then
+    if test -n "$ENABLE_DEBUG$ENABLE_DBGUTIL$ENABLE_GCOV"; then
         enable_optimized=no
     else
         enable_optimized=yes
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 0e3b52b2f487..4e41aa48233f 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -124,7 +124,6 @@ gb_GCOV_LDFLAGS := -fprofile-arcs -lgcov
 gb_CFLAGS_COMMON += -fprofile-arcs -ftest-coverage
 gb_CXXFLAGS_COMMON += -fprofile-arcs -ftest-coverage
 gb_LinkTarget_LDFLAGS += $(gb_GCOV_LDFLAGS)
-gb_COMPILEROPTFLAGS := -O0
 endif
 
 ifeq ($(DISABLE_DYNLOADING),TRUE)