diff --git a/src/Makefile b/src/Makefile
index 3a14917951ad612c4c27ac9ba792e0572a209704..debe5eebe77aa8ab76f126de0c9561770f24cf96 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS := cluster sphere trapping
+SUBDIRS := cluster sphere testing trapping
 SRCDIR=$(PWD)
 OBJDIR=$(SRCDIR)/objects
 BUILDDIR=$(SRCDIR)/../build
@@ -18,6 +18,7 @@ clean:
 wipe:
 	rm -f $(BUILDDIR)/cluster/*
 	rm -f $(BUILDDIR)/sphere/*
+	rm -f $(BUILDDIR)/testing/*
 	rm -f $(BUILDDIR)/trapping/*
 	rm -f $(OBJDIR)/*.o
 	if [ -d $(DOCSDIR)/build/html ]; then rm -r $(DOCSDIR)/build/html; fi
diff --git a/src/testing/Makefile b/src/testing/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..de9a26d7f070decadead8901a7b32f0bb06c625b
--- /dev/null
+++ b/src/testing/Makefile
@@ -0,0 +1,27 @@
+ifndef BUILDDIR
+override BUILDDIR=../../build/testing
+endif
+ifndef OBJDIR
+override OBJDIR=../objects
+endif
+
+include ../make.inc
+
+
+CXX_TEDF_OBJS=$(OBJDIR)/test_TEDF.o $(OBJDIR)/Configuration.o $(OBJDIR)/file_io.o $(OBJDIR)/Parsers.o
+
+CXX_TTMS_OBJS=$(OBJDIR)/test_TTMS.o $(OBJDIR)/file_io.o $(OBJDIR)/Parsers.o $(OBJDIR)/TransitionMatrix.o
+
+all: $(BUILDDIR)/test_TEDF $(BUILDDIR)/test_TTMS
+
+$(BUILDDIR)/test_TEDF: $(CXX_TEDF_OBJS)
+	$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/test_TEDF $(CXX_TEDF_OBJS) $(CXXLDFLAGS) 
+
+$(BUILDDIR)/test_TTMS: $(CXX_TTMS_OBJS)
+	$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/test_TTMS $(CXX_TTMS_OBJS) $(CXXLDFLAGS) 
+
+clean:
+	rm -f $(CXX_TEDF_OBJS) $(CXX_TTMS_OBJS)
+
+wipe:
+	rm -f $(BUILDDIR)/test_TEDF $(BUILDDIR)/test_TTMS $(CXX_TEDF_OBJS) $(CXX_TTMS_OBJS)