diff --git a/Makefile b/Makefile
index 72a48742c11b29f6003784def0861af19ad01243..0ca33357d62d985e77167fd6ee39b6592faa2904 100644
--- a/Makefile
+++ b/Makefile
@@ -76,13 +76,13 @@ linting_cpp:
 #                                    Tests                                    #
 ###############################################################################
 
+test: install
+	$(MAKE) -C test test
 .PHONY: test
-test:
-	cd test && octave Run_Test.m
 
-.PHONY: pkg-test
-pkg-test: install
-	octave --eval "pkg load caosdb; cc = caosdbClass()"
+###############################################################################
+#                          Packaging and Installation                         #
+###############################################################################
 
 .PHONY: pkg
 pkg: dist/caosdb.tar.gz
diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..df22f004530a83663c67a56cc7aa19be0c62aa4f
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,47 @@
+# ** header v3.0
+# This file is a part of the CaosDB Project.
+#
+# Copyright (C) 2021 IndiScale GmbH <info@indiscale.com>
+# Copyright (C) 2021 Daniel Hornung <d.hornung@indiscale.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+# ** end header
+
+# This Makefile depends on an installation with the base dir's Makefile.
+#
+# Specifically, the libraries must have be installed with Conan.
+
+.PHONY: help
+help:
+	@echo "Targets:"
+	@echo "    pkg - create tar.gz archive of the octave package."
+	@echo "    style - auto-format the source files."
+	@echo "    test - run unit tests."
+	@echo "    doc - create the documentation."
+
+###############################################################################
+#                                    Tests                                    #
+###############################################################################
+
+test: test_octave test_cpp
+.PHONY: test
+
+test_octave:
+	octave Run_Test.m
+.PHONY: test_octave
+
+test_cpp:
+	
+.PHONY: test_cpp