diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99cd546853..7a480cb32a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -304,3 +304,24 @@ if(POLICY CMP0037)
     cmake_policy(POP)
 endif()
 
+#############################
+# Testing steps
+#############################
+# Target: test
+set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/hip_tests)
+configure_file(tests/hip_tests.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)
+if(POLICY CMP0037)
+    cmake_policy(PUSH)
+    cmake_policy(SET CMP0037 OLD)
+endif()
+add_custom_target(install_for_test COMMAND "${CMAKE_COMMAND}" --build . --target install
+                                   WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_custom_target(test COMMAND ${CMAKE_COMMAND} .
+                       COMMAND make
+                       COMMAND make test
+                       WORKING_DIRECTORY ${BUILD_DIR}
+                       DEPENDS install_for_test)
+if(POLICY CMP0037)
+    cmake_policy(POP)
+endif()
+
diff --git a/tests/hip_tests.txt b/tests/hip_tests.txt
new file mode 100644
index 0000000000..35246def8a
--- /dev/null
+++ b/tests/hip_tests.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 2.8.3)
+project(hip_tests)
+
+# Setup
+set(HIP_PATH @CMAKE_INSTALL_PREFIX@)
+set(ENV{HIP_PATH} ${HIP_PATH})
+set(HIP_SRC_PATH @hip_SOURCE_DIR@)
+set(CMAKE_MODULE_PATH "${HIP_PATH}/cmake" ${CMAKE_MODULE_PATH})
+include(${HIP_SRC_PATH}/tests/hit/HIT.cmake)
+
+# Add tests
+hit_add_directory(${HIP_SRC_PATH}/tests/src)