diff --git a/t/def.mk b/t/def.mk
new file mode 100644
index 0000000..bf943c6
--- /dev/null
+++ b/t/def.mk
@@ -0,0 +1,18 @@
+.PHONY: test test-junit
+
+TEST = greeting-test
+
+MKDIR_P = mkdir -p
+
+test: $(TEST)
+	@for x in $^; do \
+		echo $(bin_output_path)/$$x; \
+		$(bin_output_path)/$$x; \
+	done
+
+test-junit: $(TEST)
+	$(MKDIR_P) $(output_path)/test-results
+	@for x in $^; do \
+		echo $(bin_output_path)/$$x -r junit -o $(output_path)/test-results/$$x.xml --success; \
+		$(bin_output_path)/$$x -r junit -o $(output_path)/test-results/$$x.xml --success || :; \
+	done
diff --git a/t/greeting-test/def.mk b/t/greeting-test/def.mk
new file mode 100644
index 0000000..411cf94
--- /dev/null
+++ b/t/greeting-test/def.mk
@@ -0,0 +1,6 @@
+name := greeting-test
+lang := cpp
+type := bin
+
+source_list := greeting-test.cpp
+source_lib_list := catch greeting
diff --git a/t/greeting-test.cpp b/t/greeting-test/source/greeting-test.cpp
similarity index 78%
rename from t/greeting-test.cpp
rename to t/greeting-test/source/greeting-test.cpp
index 1719469..1853540 100644
--- a/t/greeting-test.cpp
+++ b/t/greeting-test/source/greeting-test.cpp
@@ -1,7 +1,7 @@
-#include <mod/greeting.hpp>
+#include <greeting/greeting.hpp>
 
 #define CATCH_CONFIG_MAIN
-#include <mod/3rdparty/catch/catch.hpp>
+#include <catch/catch.hpp>
 
 TEST_CASE("greeting generation") {
   using greeting::make_greeting;