diff --git a/src/test/Makefile b/src/test/Makefile
new file mode 100644
index 0000000..debc205
--- /dev/null
+++ b/src/test/Makefile
@@ -0,0 +1,53 @@
+$(VERBOSE).SILENT:
+
+C_PROGNAME = cmock
+CPP_PROGNAME = cppmock
+CC = gcc
+CC += -c
+CPP = g++
+CPP += -c
+LD = g++
+
+C_OBJFILES = $(patsubst %.c,%.o,$(wildcard *.c))
+CPP_OBJFILES = cppmocktest.o embedded.o
+
+
+all: $(C_PROGNAME) $(CPP_PROGNAME)
+
+clean:
+	@echo "Cleaning object files"
+	@echo "    rm -f     *.o"
+	rm -f *.o
+	@echo "Cleaning backups"
+	@echo "    rm -f     *~"
+	rm -f *~
+	@echo "Removing programm"
+	@echo "    rm -f     "$(C_PROGNAME)
+	rm -f $(C_PROGNAME)
+	@echo "    rm -f     "$(CPP_PROGNAME)
+	rm -f $(CPP_PROGNAME)
+
+
+%.o: %.c
+	@echo "Compiling "$@
+	@echo "    CC        "$<
+	$(CC) $<
+
+%.o: %.cpp
+	@echo "Compiling "$@
+	@echo "    CPP       "$<
+	$(CPP) -I/home/mlong/tools/gtest/gtest-1.5.0/include $<
+
+$(C_PROGNAME): $(C_OBJFILES)
+	@echo "Linking "$@
+	@echo "    LD        -o "$(C_PROGNAME)"        "$(C_OBJFILES)
+	$(LD) -o $(C_PROGNAME) $(C_OBJFILES)
+
+$(CPP_PROGNAME): $(CPP_OBJFILES) $(C_OBJFILES)
+	@echo "Linking "$@
+	@echo "    LD        -o "$(CPP_PROGNAME)"        "$(CPP_OBJFILES)
+	$(LD) -L/home/mlong/tools/gtest -o $(CPP_PROGNAME) $(CPP_OBJFILES) -lgtest -lpthread -lgtest_main
+
+nothing:
+	@echo "Nothing to do; quitting  :("
+	@echo "HINT: Try make all"
diff --git a/src/test/cmocktest.c b/src/test/cmocktest.c
index c22b900..a13bd69 100644
--- a/src/test/cmocktest.c
+++ b/src/test/cmocktest.c
@@ -6,7 +6,7 @@
  */
 
 #include "embedded.h"
-#include "cmock.h"
+#include "../cmock.h"
 #include <assert.h>
 #include <stdio.h>
 
diff --git a/src/test/cppmocktest.cpp b/src/test/cppmocktest.cpp
index cf8f7ef..5e1d6ed 100644
--- a/src/test/cppmocktest.cpp
+++ b/src/test/cppmocktest.cpp
@@ -6,7 +6,7 @@
 // Description : Hello World in C++, Ansi-style
 //============================================================================
 
-#include "cppmock.hpp"
+#include "../cppmock.hpp"
 
 extern "C"{
 #include "embedded.h"