diff --git a/hpvm/test/pipeline/Makefile b/hpvm/test/pipeline/Makefile
index 952c858c6edffea67c4f16ea6c2de44759cd5def..548949fe72aea79ef6b387154384ad4e7d3cd374 100644
--- a/hpvm/test/pipeline/Makefile
+++ b/hpvm/test/pipeline/Makefile
@@ -86,7 +86,7 @@ endif
 default: $(FAILSAFE) $(BUILD_DIR) $(KERNEL_OCL) $(EXE)
 
 $(KERNEL_OCL) : $(KERNEL)
-	$(OCLBE) -debug $< -o $@
+	$(OCLBE) $< -o $@
 
 $(EXE) : $(HOST_LINKED)
 	$(CXX) -O3 $(LDFLAGS) $< -o $@
@@ -95,7 +95,7 @@ $(HOST_LINKED) : $(HOST) $(OBJS) $(HPVM_RT_LIB)
 	$(LLVM_LINK) $^ -S -o $@
 
 $(HOST) $(KERNEL): $(BUILD_DIR)/$(HPVM_OBJS)
-	$(OPT) -debug $(HPVM_OPTFLAGS) -S $< -o $(HOST)
+	$(OPT) $(HPVM_OPTFLAGS) -S $< -o $(HOST)
 
 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)
@@ -107,6 +107,6 @@ $(BUILD_DIR)/main.ll : $(SRC_DIR)/main.cc
 	$(CC) $(CXXFLAGS) -emit-llvm -S -o $@ $<
 
 $(BUILD_DIR)/main.hpvm.ll : $(BUILD_DIR)/main.ll
-	$(OPT) -debug-only=genhpvm $(TESTGEN_OPTFLAGS) $< -S -o $@
+	$(OPT) $(TESTGEN_OPTFLAGS) $< -S -o $@
 
 ## END HPVM MAKEFILE