diff --git a/.travis.yml b/.travis.yml
index 19cc13a72f89e14fba705519fe0f7cb1717e9985..75999fb97f0b132c4aaac9c4cfd59d71cabdd226 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ script:
     - export CC=gcc-5
     - mkdir build
     - cd build 
-    - cmake ../
+    - cmake -DBUILD_TESTS=ON ../
     - make
     - ctest --verbose
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54547c3a7fa959d477c39c12e389eac476c1ada0..871d96784c469d65ef3f714aeb853a4b2871963f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ add_definitions ("-D_GNU_SOURCE")
 
 set(CMAKE_C_FLAGS "-std=c11 -Wall -Wextra")
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/libdap-test/CMakeLists.txt")
+if(BUILD_TESTS)
     enable_testing()
     add_subdirectory(test)
 endif()