diff --git a/tests/cmake-test.sh b/tests/cmake-test.sh
new file mode 100755
index 0000000..fedcb46
--- /dev/null
+++ b/tests/cmake-test.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Test script for CMake build
+
+BASE_DIR=$(dirname "$0")/..
+. "${BASE_DIR}/functions.sh"
+
+BUILD_DIR="build"
+
+cmake_prepare() {
+  [ ! -e "CMakeLists.txt" ] && ln -s {_,}CMakeLists.txt
+}
+
+cmake_build() {
+  einfo Building compton with cmake $@
+
+  [ -e "${BUILD_DIR}" ] && rm -r "${BUILD_DIR}"
+  mkdir "${BUILD_DIR}" && cd "${BUILD_DIR}" || die
+  cmake ${@} .. || die
+  make VERBOSE=1 -B || die
+  cd -
+
+  einfo Build completed successfully
+}
+
+show_build_help_msg() {
+  "${BUILD_DIR}/compton" -h | less
+}
+
+main() {
+  cmake_prepare
+  cmake_build "${@}"
+  # show_build_help_msg
+}
+
+main "${@}"
diff --git a/tests/make-tests.sh b/tests/make-tests.sh
new file mode 100755
index 0000000..06700a0
--- /dev/null
+++ b/tests/make-tests.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Test script for GNU make build
+
+BASE_DIR=$(dirname "$0")/..
+. "${BASE_DIR}/functions.sh"
+
+OPTIONS=( NO_XINERAMA NO_LIBCONFIG NO_REGEX_PCRE NO_REGEX_PCRE_JIT
+  NO_VSYNC_DRM NO_VSYNC_OPENGL NO_VSYNC_OPENGL_GLSL NO_VSYNC_OPENGL_FBO
+  NO_VSYNC_OPENGL_VBO NO_DBUS NO_XSYNC NO_C2 )
+
+for o in "${OPTIONS[@]}"; do
+  einfo Building with $o
+  make "${o}=1" -B "${@}" || die
+  einfo Build completed.
+done