diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e0550f..d684f17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,9 @@ set(USE_CCACHE ON)
 
 add_subdirectory(autogen)
 
+enable_testing()
+add_subdirectory(tests)
+
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..3dd3389
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,7 @@
+function (create_test TEST_NAME)
+    set(TARGET_NAME test_${TEST_NAME})
+    add_executable(${TARGET_NAME} ${ARGN})
+    target_link_libraries(${TARGET_NAME} PRIVATE openblocks)
+    add_dependencies(${TARGET_NAME} openblocks)
+    add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME})
+endfunction ()
\ No newline at end of file