diff --git a/CMakeLists.txt b/CMakeLists.txt
index aac50d3729fb547b2637ca433c4ccdbe205b9e3c..f22327e2d1fefc0e806ad0b18de335a4ae18418a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )
 # Automatic settings #
 #--------------------#
 #get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME)
+set(CMAKE_VERBOSE_MAKEFILE ON)
 
 # Processing user variables
 if (WITH_TIME_PROFILING)
@@ -85,3 +86,7 @@ else ()
     message ("Not Windows")
 endif ()
 
+find_package(Boost COMPONENTS unit_test_framework REQUIRED)
+IF (Boost_FOUND)
+    include_directories(${Boost_INCLUDE_DIR})
+endif()
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d6a387532fdc5003d602db6077fc9b27233353b..9a93e97bf2c4b780fab5a8d571419c86717c0606 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,6 +26,15 @@ add_library(particle_swarm SHARED
         LearningMethods/ParticleSwarm.cpp
         LearningMethods/ParticleSwarm.h)
 
+add_library(boost_unit_test SHARED tests/boost_test_lib_dummy.cpp)
+
+add_executable(neuron_test tests/neuron_test.cpp)
+target_link_libraries(neuron_test boost_unit_test neuron)
+
+add_executable(linear_neuron_test tests/NeuronLinear_test.cpp)
+target_link_libraries(linear_neuron_test boost_unit_test neuron)
+
 add_executable(test_cases main.cpp)
 
-target_link_libraries(test_cases neuron particle_swarm boost_serialization)
\ No newline at end of file
+target_link_libraries(test_cases neuron particle_swarm boost_serialization)
+
diff --git a/src/tests/boost_test_lib_dummy.cpp b/src/tests/boost_test_lib_dummy.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e13ffe1cc1c0b6ebc22ded71c38462c3e5ed1986
--- /dev/null
+++ b/src/tests/boost_test_lib_dummy.cpp
@@ -0,0 +1,6 @@
+//
+// Created by David on 11.07.2018.
+//
+
+#define BOOST_TEST_MODULE neuron_test
+#include <boost/test/included/unit_test.hpp>