diff --git a/.travis.yml b/.travis.yml
index 4ccf67e..07f6a1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,23 @@
 language: c
 compiler:
-  - gcc
+    - gcc-5
 sudo: false
 addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
-  packages:
+    packages:
     - check
-    - gcc-4.9
+    - gcc-5
     - gettext
     - cmake
 before_install:
   - pip install --user cpp-coveralls
   - .ci/install-libcsptr.sh
   - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/lib
-  - export LIBRARY_PATH=$LIBRARY_PATH:$HOME/lib
+  - export CFLAGS="-g -O0"
 script:
-  - mkdir -p build && cd $_
-  - cmake ..
-  - make
-  - make -C samples test
+  - mkdir -p build && cd $_ && cmake -DCMAKE_PREFIX_PATH=$HOME .. && make && make -C samples test
 after_success:
   - coveralls --gcov gcov-4.9 --exclude samples --exclude dependencies --gcov-options '\-lp' -b .
 after_failure:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46292b0..7721909 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ include(CheckLibraryExists)
 CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
 
 find_package(PCRE)
-find_package(Libcsptr)
+find_package(Libcsptr REQUIRED)
 
 configure_file(
   "${CMAKE_SOURCE_DIR}/src/config.h.in"
@@ -75,19 +75,18 @@ enable_testing()
 
 add_subdirectory(samples)
 
-include_directories(include src)
+include_directories(include src ${CSPTR_INCLUDE_DIRS})
+
 add_library(criterion SHARED ${SOURCE_FILES} ${INTERFACE_FILES})
 
-link_directories(/usr/lib)
-
-target_link_libraries(criterion csptr)
+target_link_libraries(criterion ${CSPTR_LIBRARIES})
 
 if (HAVE_CLOCK_GETTIME)
   target_link_libraries(criterion rt)
 endif()
 
 if (PCRE_FOUND)
-  target_link_libraries(criterion pcre)
+  target_link_libraries(criterion ${PCRE_LIBRARIES})
 endif()
 
 install(FILES ${INTERFACE_FILES} DESTINATION include/criterion)