diff --git a/libut/Makefile b/libut/Makefile
index e21045b8..ba738cc1 100644
--- a/libut/Makefile
+++ b/libut/Makefile
@@ -7,6 +7,7 @@ LIBDIR=/usr/lib
 CFLAGS+=-I$(INCDIR)
 CFLAGS+=-Wall -Wextra -Werror -fPIC
 CFLAGS+=-g
+CFLAGS+=$(OPTFLAGS)
 
 libut.a: $(OBJS)
 	ar r $@ $^
diff --git a/libut/tests/Makefile b/libut/tests/Makefile
index 2feb6c30..f4caf9eb 100644
--- a/libut/tests/Makefile
+++ b/libut/tests/Makefile
@@ -4,7 +4,8 @@ OBJS=$(patsubst %,%.o,$(PROGS))
 
 CFLAGS += -I../include
 CFLAGS += -g
-CFLAGS += -Wall -Wextra
+CFLAGS += -Wall -Wextra -Werror -fPIC
+CFLAGS += $(OPTFLAGS)
 LDFLAGS += -L.. -lut
 
 TEST_TARGET=run_tests
diff --git a/tests/Makefile b/tests/Makefile
index 85c02810..4ee14bc7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -18,6 +18,7 @@ CFLAGS += -I$(HASHDIR)
 #CFLAGS += -DHASH_BLOOM=16
 #CFLAGS += -O2
 CFLAGS += -g
+CFLAGS += $(OPTFLAGS)
 #CFLAGS += -Wstrict-aliasing=2
 CFLAGS += -Wall 
 #CFLAGS += -Wextra