diff --git a/.travis.yml b/.travis.yml
index 2dc9f85ce15bbb65ebbaab4bc6fab4867b27ccff..c7001a099d937e0626f754aff92d13867d974d1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,8 @@ script:
     - mkdir build
     - cd build 
     - cmake ../
-    - make libdap-test
-    - ./test/libdap-test
+    - make
+    - make test
 
 addons:
   apt:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 669013777aba6c7c58aba1a9826fe2d6fb207cbf..06c50a1cd5c711fe2451695d6216095fbe811c66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,8 @@ add_definitions ("-D_GNU_SOURCE")
 
 set(CMAKE_C_FLAGS "-std=c11 -Wall -Wextra")
 
+enable_testing()
+
 add_subdirectory(core)
 add_subdirectory(crypto)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)
diff --git a/README.md b/README.md
index ea6f6289250269700606980a1eea31253efec753..5f0611d166341f3ca3c0bc199eb0be1e07d6949e 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Deus Applications Prototypes: core library
 mkdir build
 cd build
 cmake ../
-make libdap-test
-./test/libdap-test
+make
+make test
 ```
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 415379a792768802c4479a7ed0823c2746db4f75..e3c756d43d5e73feaa0359a521714dd574319cc7 100755
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,3 +20,8 @@ add_executable(${PROJECT_NAME} ${TEST_FILES} ${SRC} ${HEADERS})
 target_link_libraries(${PROJECT_NAME} Qt5::Test)
 target_link_libraries(${PROJECT_NAME} dap_core)
 target_link_libraries(${PROJECT_NAME} dap_crypto)
+
+add_test(
+    NAME libdap-test
+    COMMAND libdap-test
+)