diff --git a/test/AssocVector/Makefile b/test/AssocVector/Makefile
new file mode 100644
index 0000000..d15cc73
--- /dev/null
+++ b/test/AssocVector/Makefile
@@ -0,0 +1,16 @@
+include ../Makefile.common
+
+BIN := main$(BIN_SUFFIX)
+SRC := main.cpp
+OBJ := $(SRC:.cpp=.o)
+
+.PHONY: all clean
+all: $(BIN)
+clean: cleandeps
+	$(RM) $(BIN)
+	$(RM) $(OBJ)
+
+$(BIN): $(OBJ)
+	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+include ../../Makefile.deps
diff --git a/test/CheckReturn/Makefile b/test/CheckReturn/Makefile
new file mode 100644
index 0000000..d15cc73
--- /dev/null
+++ b/test/CheckReturn/Makefile
@@ -0,0 +1,16 @@
+include ../Makefile.common
+
+BIN := main$(BIN_SUFFIX)
+SRC := main.cpp
+OBJ := $(SRC:.cpp=.o)
+
+.PHONY: all clean
+all: $(BIN)
+clean: cleandeps
+	$(RM) $(BIN)
+	$(RM) $(OBJ)
+
+$(BIN): $(OBJ)
+	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+include ../../Makefile.deps
diff --git a/test/Checker/Makefile b/test/Checker/Makefile
new file mode 100644
index 0000000..d15cc73
--- /dev/null
+++ b/test/Checker/Makefile
@@ -0,0 +1,16 @@
+include ../Makefile.common
+
+BIN := main$(BIN_SUFFIX)
+SRC := main.cpp
+OBJ := $(SRC:.cpp=.o)
+
+.PHONY: all clean
+all: $(BIN)
+clean: cleandeps
+	$(RM) $(BIN)
+	$(RM) $(OBJ)
+
+$(BIN): $(OBJ)
+	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+include ../../Makefile.deps
diff --git a/test/LevelMutex/Makefile b/test/LevelMutex/Makefile
new file mode 100644
index 0000000..6f2c457
--- /dev/null
+++ b/test/LevelMutex/Makefile
@@ -0,0 +1,17 @@
+include ../Makefile.common
+
+BIN := main$(BIN_SUFFIX)
+SRC := main.cpp MultiThreadTests.cpp Thing.cpp ThreadPool.cpp
+OBJ := $(SRC:.cpp=.o)
+LDLIBS += -lpthread
+
+.PHONY: all clean
+all: $(BIN)
+clean: cleandeps
+	$(RM) $(BIN)
+	$(RM) $(OBJ)
+
+$(BIN): $(OBJ)
+	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+include ../../Makefile.deps
diff --git a/test/Lockable/Makefile b/test/Lockable/Makefile
new file mode 100644
index 0000000..2095b98
--- /dev/null
+++ b/test/Lockable/Makefile
@@ -0,0 +1,17 @@
+include ../Makefile.common
+
+BIN := main$(BIN_SUFFIX)
+SRC := main.cpp ThreadPool.cpp
+OBJ := $(SRC:.cpp=.o)
+LDLIBS += -lpthread
+
+.PHONY: all clean
+all: $(BIN)
+clean: cleandeps
+	$(RM) $(BIN)
+	$(RM) $(OBJ)
+
+$(BIN): $(OBJ)
+	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+include ../../Makefile.deps
diff --git a/test/SafeBits/Makefile b/test/SafeBits/Makefile
new file mode 100644
index 0000000..ea9f894
--- /dev/null
+++ b/test/SafeBits/Makefile
@@ -0,0 +1,16 @@
+include ../Makefile.common
+
+BIN := SafeBitTest$(BIN_SUFFIX)
+SRC := SafeBitTest.cpp
+OBJ := $(SRC:.cpp=.o)
+
+.PHONY: all clean
+all: $(BIN)
+clean: cleandeps
+	$(RM) $(BIN)
+	$(RM) $(OBJ)
+
+$(BIN): $(OBJ)
+	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+include ../../Makefile.deps
diff --git a/test/ThreadLocal/Makefile b/test/ThreadLocal/Makefile
new file mode 100644
index 0000000..3889ead
--- /dev/null
+++ b/test/ThreadLocal/Makefile
@@ -0,0 +1,17 @@
+include ../Makefile.common
+
+BIN := main$(BIN_SUFFIX)
+SRC := main.cpp ThreadTests.cpp ThreadPool.cpp
+OBJ := $(SRC:.cpp=.o)
+LDLIBS += -lpthread
+
+.PHONY: all clean
+all: $(BIN)
+clean: cleandeps
+	$(RM) $(BIN)
+	$(RM) $(OBJ)
+
+$(BIN): $(OBJ)
+	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+include ../../Makefile.deps