diff --git a/src/templating/test1/Makefile b/src/templating/test1/Makefile
new file mode 100644
index 000000000..5f3997c51
--- /dev/null
+++ b/src/templating/test1/Makefile
@@ -0,0 +1,13 @@
+.PHONY: test clean
+
+test:
+	@echo starting test
+	@valgrind ../mustach json must > resu.last 2> vg.last
+	@sed -i 's:^==[0-9]*== ::' vg.last
+	@diff -w resu.ref resu.last && echo "result ok" || echo "ERROR! Result differs"
+	@awk '/^ *total heap usage: .* allocs, .* frees,.*/{if($$4-$$6)exit(1)}' vg.last || echo "ERROR! Alloc/Free issue"
+	@echo
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test2/Makefile b/src/templating/test2/Makefile
new file mode 100644
index 000000000..5f3997c51
--- /dev/null
+++ b/src/templating/test2/Makefile
@@ -0,0 +1,13 @@
+.PHONY: test clean
+
+test:
+	@echo starting test
+	@valgrind ../mustach json must > resu.last 2> vg.last
+	@sed -i 's:^==[0-9]*== ::' vg.last
+	@diff -w resu.ref resu.last && echo "result ok" || echo "ERROR! Result differs"
+	@awk '/^ *total heap usage: .* allocs, .* frees,.*/{if($$4-$$6)exit(1)}' vg.last || echo "ERROR! Alloc/Free issue"
+	@echo
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test3/Makefile b/src/templating/test3/Makefile
new file mode 100644
index 000000000..5f3997c51
--- /dev/null
+++ b/src/templating/test3/Makefile
@@ -0,0 +1,13 @@
+.PHONY: test clean
+
+test:
+	@echo starting test
+	@valgrind ../mustach json must > resu.last 2> vg.last
+	@sed -i 's:^==[0-9]*== ::' vg.last
+	@diff -w resu.ref resu.last && echo "result ok" || echo "ERROR! Result differs"
+	@awk '/^ *total heap usage: .* allocs, .* frees,.*/{if($$4-$$6)exit(1)}' vg.last || echo "ERROR! Alloc/Free issue"
+	@echo
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test4/Makefile b/src/templating/test4/Makefile
new file mode 100644
index 000000000..5f3997c51
--- /dev/null
+++ b/src/templating/test4/Makefile
@@ -0,0 +1,13 @@
+.PHONY: test clean
+
+test:
+	@echo starting test
+	@valgrind ../mustach json must > resu.last 2> vg.last
+	@sed -i 's:^==[0-9]*== ::' vg.last
+	@diff -w resu.ref resu.last && echo "result ok" || echo "ERROR! Result differs"
+	@awk '/^ *total heap usage: .* allocs, .* frees,.*/{if($$4-$$6)exit(1)}' vg.last || echo "ERROR! Alloc/Free issue"
+	@echo
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test5/Makefile b/src/templating/test5/Makefile
new file mode 100644
index 000000000..5f3997c51
--- /dev/null
+++ b/src/templating/test5/Makefile
@@ -0,0 +1,13 @@
+.PHONY: test clean
+
+test:
+	@echo starting test
+	@valgrind ../mustach json must > resu.last 2> vg.last
+	@sed -i 's:^==[0-9]*== ::' vg.last
+	@diff -w resu.ref resu.last && echo "result ok" || echo "ERROR! Result differs"
+	@awk '/^ *total heap usage: .* allocs, .* frees,.*/{if($$4-$$6)exit(1)}' vg.last || echo "ERROR! Alloc/Free issue"
+	@echo
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test6/Makefile b/src/templating/test6/Makefile
new file mode 100644
index 000000000..5fcf5c596
--- /dev/null
+++ b/src/templating/test6/Makefile
@@ -0,0 +1,17 @@
+.PHONY: test clean
+
+test-custom-write: test-custom-write.c ../mustach-json-c.h ../mustach-json-c.c ../mustach-wrap.c ../mustach.h ../mustach.c
+	@echo building test-custom-write
+	$(CC) $(CFLAGS) $(LDFLAGS) -g -o test-custom-write test-custom-write.c  ../mustach.c  ../mustach-json-c.c ../mustach-wrap.c -ljson-c
+
+test: test-custom-write
+	@echo starting test
+	@valgrind ./test-custom-write json -U must -l must -x must > resu.last 2> vg.last
+	@sed -i 's:^==[0-9]*== ::' vg.last
+	@diff -w resu.ref resu.last && echo "result ok" || echo "ERROR! Result differs"
+	@awk '/^ *total heap usage: .* allocs, .* frees,.*/{if($$4-$$6)exit(1)}' vg.last || echo "ERROR! Alloc/Free issue"
+	@echo
+
+clean:
+	rm -f resu.last vg.last test-custom-write
+