diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdd4186a..2d114c47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 2.8.5)
 
 # Detect if it is called by catkin
-IF(CATKIN_TOPLEVEL OR CATKIN_BUILD_BINARY_PACKAGE)
+IF(CATKIN_TOPLEVEL OR CATKIN_BUILD_BINARY_PACKAGE OR CATKIN_SKIP_TESTING)
   SET(CATKIN_BUILD TRUE)
-ENDIF(CATKIN_TOPLEVEL OR CATKIN_BUILD_BINARY_PACKAGE)
+ENDIF(CATKIN_TOPLEVEL OR CATKIN_BUILD_BINARY_PACKAGE OR CATKIN_SKIP_TESTING)
 
 MESSAGE(STATUS "CATKIN_BUILD=${CATKIN_BUILD}")