diff --git a/Makefile.in b/Makefile.in
index fa249d3..5e0aa08 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -140,21 +140,27 @@ $(BINRLS)/lib3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OB
 $(BINDBG)/testprogram$(EXEEXT): $(OBJDBG)/testprogram.o $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
-	$(LD) -pthread -o $@ $^ $(LIBS)
+	@$(LD) -pthread -o $@ $^ $(LIBS)
 
 $(BINDIR)/pot/lib3270.pot: $(foreach SRC, $(basename $(SOURCES)), $(TMPDIR)/pot/$(SRC).pot)
 	@rm -f $@
 	@mkdir -p `dirname $@`
 	@$(MSGCAT) --sort-output $^ > $@
 
+test: $(BINDBG)/testprogram$(EXEEXT)
+
 run: $(BINDBG)/testprogram$(EXEEXT)
-	$(BINDBG)/testprogram$(EXEEXT)
+ifeq ($(VALGRIND),no)
+	@PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" "$(BINDBG)/testprogram$(EXEEXT)"
+else
+	@PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --suppressions=valgrind.suppression --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT)
+endif
 
 memchk: $(BINDBG)/testprogram$(EXEEXT)
 ifeq ($(VALGRIND),no)
 	@cd "$(ROOTDIR)" ; .bin/Debug/testprogram$(EXEEXT)
 else
-	@cd "$(ROOTDIR)" ; G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT)
+	@cd "$(ROOTDIR)" ; \$(VALGRIND) --leak-check=full --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT)
 endif
 
 version.c: ./mkversion.sh
@@ -168,6 +174,8 @@ fallbacks.c: X3270.xad mkfb.c
 	@$(HOST_CC) -g -o $(BINDIR)/mkfb@EXEEXT@ mkfb.c
 	@$(BINDIR)/mkfb@EXEEXT@ -c X3270.xad $@
 
+cleantest: clean
+
 clean:
 	@rm -fr .obj
 	@rm -fr .bin
diff --git a/lib3270.cbp b/lib3270.cbp
index c3cd57d..10de722 100644
--- a/lib3270.cbp
+++ b/lib3270.cbp
@@ -3,6 +3,7 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="lib3270" />
+		<Option makefile_is_custom="1" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
@@ -30,8 +31,8 @@
 					<Add option="-s" />
 				</Linker>
 			</Target>
-			<Target title="testprogram">
-				<Option output=".bin/Debug/lib3270" prefix_auto="1" extension_auto="1" />
+			<Target title="test">
+				<Option output=".bin/Debug/testprogram" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj/testprogram/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
diff --git a/valgrind.suppression b/valgrind.suppression
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/valgrind.suppression
--
libgit2 0.21.2