diff --git a/Makefile b/Makefile
index 95c87ef..529c057 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@ clean: ## Clean up
 	if [ -f fimdlp/cfimdlp.cpp ]; then rm fimdlp/cfimdlp.cpp; fi;
 	if [ -f fimdlp/cppfimdlp.cpython-310-darwin.so ]; then rm fimdlp/cppfimdlp.cpython-310-darwin.so; fi;
 
+test:
+	cd fimdlp/testcpp && ./test.sh
+
 lint:  ## Lint and static-check
 	black fimdlp
 	flake8 fimdlp
diff --git a/fimdlp/testcpp/.gitignore b/fimdlp/testcpp/.gitignore
new file mode 100644
index 0000000..266d0b7
--- /dev/null
+++ b/fimdlp/testcpp/.gitignore
@@ -0,0 +1,2 @@
+build
+build/*
\ No newline at end of file
diff --git a/fimdlp/test/CMakeLists.txt b/fimdlp/testcpp/CMakeLists.txt
similarity index 100%
rename from fimdlp/test/CMakeLists.txt
rename to fimdlp/testcpp/CMakeLists.txt
diff --git a/fimdlp/test/FImdlp_unittest.cc b/fimdlp/testcpp/FImdlp_unittest.cc
similarity index 100%
rename from fimdlp/test/FImdlp_unittest.cc
rename to fimdlp/testcpp/FImdlp_unittest.cc
diff --git a/fimdlp/test/Metrics_unittest.cc b/fimdlp/testcpp/Metrics_unittest.cc
similarity index 100%
rename from fimdlp/test/Metrics_unittest.cc
rename to fimdlp/testcpp/Metrics_unittest.cc
diff --git a/fimdlp/test/test.sh b/fimdlp/testcpp/test.sh
similarity index 100%
rename from fimdlp/test/test.sh
rename to fimdlp/testcpp/test.sh