diff --git a/.travis.yml b/.travis.yml
index 158a37d..60d4617 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,4 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq cmake libsdl2-dev libsdl2-image-dev g++-4.8
   - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
-script: cmake . -DRUN_GUI_TESTS=OFF -DCMAKE_INSTALL_PREFIX=`pwd`/_prefix -DSDL2PP_WITH_WERROR=YES && make && make test && make install
+script: cmake . -DSDL2PP_ENABLE_GUI_TEST=OFF -DCMAKE_INSTALL_PREFIX=`pwd`/_prefix -DSDL2PP_WITH_WERROR=YES && make && make test && make install
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68a3940..5d3fe76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,12 +102,19 @@ IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
 	TARGET_LINK_LIBRARIES(SDL2pp ${SDL2_ALL_LIBRARIES})
 	SET_TARGET_PROPERTIES(SDL2pp PROPERTIES VERSION 1.0.0 SOVERSION 1)
 
-	# demos and tests
-	OPTION(RUN_GUI_TESTS "Run GUI tests (requires X11 display)" ON)
-	ENABLE_TESTING()
+	# examples and tests
+	OPTION(SDL2PP_WITH_EXAMPLES "Build examples" ON)
+	OPTION(SDL2PP_WITH_TESTS "Build tests" ON)
+	OPTION(SDL2PP_ENABLE_GUI_TEST "Enable GUI test (requires X11 display)" ON)
 
-	ADD_SUBDIRECTORY(demos)
-	ADD_SUBDIRECTORY(tests)
+	IF(SDL2PP_WITH_EXAMPLES)
+		ADD_SUBDIRECTORY(examples)
+	ENDIF(SDL2PP_WITH_EXAMPLES)
+
+	IF(SDL2PP_WITH_TESTS)
+		ENABLE_TESTING()
+		ADD_SUBDIRECTORY(tests)
+	ENDIF(SDL2PP_WITH_TESTS)
 
 	# pkgconfig
 	SET(PKGCONFIGDIR lib/pkgconfig CACHE STRING "directory where to install pkg-config files")
diff --git a/README.md b/README.md
index 130f777..6be47be 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ ADD_EXECUTABLE(mytarget ...)
 TARGET_LINK_LIBRARIES(mytarget ${SDL2PP_LIBRARIES})
 ```
 
-if bundled, libSDL2pp does not build demos and becomes a static
+if bundled, libSDL2pp does not build examples and becomes a static
 library, providing required SDL2 includes/libs in the mentioned
 variables.
 
diff --git a/demos/CMakeLists.txt b/examples/CMakeLists.txt
similarity index 100%
rename from demos/CMakeLists.txt
rename to examples/CMakeLists.txt
diff --git a/demos/audio_sine.cc b/examples/audio_sine.cc
similarity index 100%
rename from demos/audio_sine.cc
rename to examples/audio_sine.cc
diff --git a/demos/audio_wav.cc b/examples/audio_wav.cc
similarity index 100%
rename from demos/audio_wav.cc
rename to examples/audio_wav.cc
diff --git a/demos/image.cc b/examples/image.cc
similarity index 100%
rename from demos/image.cc
rename to examples/image.cc
diff --git a/demos/lines.cc b/examples/lines.cc
similarity index 100%
rename from demos/lines.cc
rename to examples/lines.cc
diff --git a/demos/rendertarget.cc b/examples/rendertarget.cc
similarity index 100%
rename from demos/rendertarget.cc
rename to examples/rendertarget.cc
diff --git a/demos/sprites.cc b/examples/sprites.cc
similarity index 100%
rename from demos/sprites.cc
rename to examples/sprites.cc
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1330632..aeb6025 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -30,7 +30,7 @@ ENDFOREACH(TEST ${TESTS})
 FOREACH(TEST ${GUI_TESTS})
 	ADD_EXECUTABLE(${TEST} ${TEST}.cc)
 	TARGET_LINK_LIBRARIES(${TEST} SDL2pp)
-	IF(RUN_GUI_TESTS)
+	IF(SDL2PP_ENABLE_GUI_TEST)
 		ADD_TEST(${TEST} ${TEST})
-	ENDIF(RUN_GUI_TESTS)
+	ENDIF(SDL2PP_ENABLE_GUI_TEST)
 ENDFOREACH(TEST ${TESTS})