--- criu-1.3.1/Makefile
+++ criu-1.3.1/Makefile
@@ -102,9 +102,6 @@
 
 ifeq ($(DEBUG),1)
 	DEFINES += -DCR_DEBUG
-	CFLAGS	+= -O0 -ggdb3
-else
-	CFLAGS	+= -O2
 endif
 
 ifeq ($(GMON),1)
--- criu-1.3.1/test/zdtm/lib/Makefile
+++ criu-1.3.1/test/zdtm/lib/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.inc
 
-CFLAGS	= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
+CFLAGS	= -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 CFLAGS	+= $(USERCFLAGS)
 
 LIBDIR	= .
--- criu-1.3.1/test/zdtm/live/static/Makefile
+++ criu-1.3.1/test/zdtm/live/static/Makefile
@@ -3,7 +3,7 @@
 LIBDIR	= ../../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
-CFLAGS	= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
+CFLAGS	= -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 CFLAGS	+= $(USERCFLAGS)
 
 TST_NOFILE	=				\
--- criu-1.3.1/test/zdtm/live/streaming/Makefile
+++ criu-1.3.1/test/zdtm/live/streaming/Makefile
@@ -3,7 +3,7 @@
 LIBDIR	= ../../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
-CFLAGS	= -g -O2 -Wall -Werror -fno-strict-aliasing
+CFLAGS	= -Wall -fno-strict-aliasing
 CFLAGS	+= $(USERCFLAGS)
 
 TST_NOFILE	=	\
--- criu-1.3.1/test/zdtm/live/transition/Makefile
+++ criu-1.3.1/test/zdtm/live/transition/Makefile
@@ -3,7 +3,7 @@
 LIBDIR	= ../../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
-CFLAGS	= -g -O2 -Wall -Werror
+CFLAGS	= -Wall
 CFLAGS	+= $(USERCFLAGS)
 
 TST_NOFILE	=	\