diff --git a/src/test/Makefile b/src/test/Makefile
index 0f9a499..9b5b264 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -1,5 +1,6 @@
 $(VERBOSE).SILENT:
 
+TEMPLATE_PROGNAME = ../../build/template
 C_PROGNAME = ../../build/cmock
 CPP_PROGNAME = ../../build/cppmock
 CC = gcc
@@ -10,14 +11,14 @@ LD = g++
 
 ODIR = ../../build
 
-C_OBJFILES = $(patsubst %.c,../../build/%.o,$(wildcard *.c))
-
+C_OBJFILES = ../../build/cmocktest.o ../../build/embedded.o
+TEMPLATE_OBJFILES = ../../build/test_suite_template.o
 CPP_OBJFILES = ../../build/cppmocktest.o ../../build/embedded.o
 CPP_LIBS = -lgtest -lpthread -lgtest_main
 
 ODIR = ../../build
 
-all: $(C_PROGNAME) $(CPP_PROGNAME)
+all: $(C_PROGNAME) $(CPP_PROGNAME) $(TEMPLATE_PROGNAME)
 
 .PHONY: clean
 
@@ -45,6 +46,11 @@ clean:
 	@echo "    CPP       "$<
 	$(CPP) -I/home/mlong/tools/gtest/gtest-1.5.0/include -o $@ $< 
 
+$(TEMPLATE_PROGNAME): $(TEMPLATE_OBJFILES)
+	@echo "Linking "$@
+	@echo "    LD        -o "ctemplate"        "$(TEMPLATE_OBJFILES)
+	$(LD) -o $(TEMPLATE_PROGNAME) $(TEMPLATE_OBJFILES)
+
 $(C_PROGNAME): $(C_OBJFILES)
 	@echo "Linking "$@
 	@echo "    LD        -o "$(C_PROGNAME)"        "$(C_OBJFILES)
diff --git a/src/test/test_suite_template.c b/src/test/test_suite_template.c
new file mode 100644
index 0000000..2c469da
--- /dev/null
+++ b/src/test/test_suite_template.c
@@ -0,0 +1,40 @@
+#include <assert.h>
+#include <stdio.h>
+
+void setup();
+#define TEST_F(SUITE, NAME) void NAME()
+#define RUN_TEST(TESTNAME) printf(" Running %s: ", #TESTNAME); fflush(0); setup(); TESTNAME(); printf(" SUCCESS\n");
+
+
+/* Initialializers called for every test */
+void setup()
+{
+
+}
+
+/* Tests go here */
+TEST_F(GreeterTests, hello_world)
+{
+	assert(1 == 0);
+}
+
+
+
+int main()
+{
+	setbuf(stderr, NULL);
+	fprintf(stdout, "-------------\n");
+	fprintf(stdout, "Running Tests\n");
+	fprintf(stdout, "-------------\n\n");
+    fflush(0);
+
+	/* Run tests */
+    RUN_TEST(hello_world);
+
+
+    printf("\n-------------\n");
+    printf("Complete\n");
+	printf("-------------\n\n");
+
+	return 0;
+}