diff --git a/.travis.yml b/.travis.yml
index 48e49df..320e87d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,9 +50,9 @@ before_install:
 script:
   - build_main_platforms
   - mkdir build && cd build
-  - cmake -DCMAKE_CXX_COMPILER=$COMPILER ..
+  - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug ..
   - make
-  - test/unit-tests/unit-tests
+  - ctest -V
 
 notifications:
   email: false
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1d38a6..a65df53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,9 @@ project(arduino_midi_library)
 set(ROOT_SOURCE_DIR ${PROJECT_SOURCE_DIR})
 include_directories(${ROOT_SOURCE_DIR})
 
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
+enable_testing()
 
 add_subdirectory(external)
 add_subdirectory(src)
diff --git a/test/unit-tests/CMakeLists.txt b/test/unit-tests/CMakeLists.txt
index 9d02706..c4cddd3 100644
--- a/test/unit-tests/CMakeLists.txt
+++ b/test/unit-tests/CMakeLists.txt
@@ -30,10 +30,4 @@ target_link_libraries(unit-tests
     test-mocks
 )
 
-option(RUN_UNIT_TESTS_IN_POST_BUILD false)
-
-if (RUN_UNIT_TESTS_IN_POST_BUILD)
-    add_custom_command(TARGET unit-tests POST_BUILD
-        COMMAND ${unit-tests_BINARY_DIR}/unit-tests
-    )
-endif()
+add_test(unit-tests ${unit-tests_BINARY_DIR}/unit-tests --gtest_color=yes)