diff --git a/CMakeLists.txt b/CMakeLists.txt
index f109c97a..a3e6c800 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,11 +33,6 @@ MARK_AS_ADVANCED(FORCE POLYVOX_VERSION)
 SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
 include(FeatureSummary)
 
-find_package(Qt5Test 5.2)
-
-set_package_properties(Qt5Test PROPERTIES DESCRIPTION "C++ framework" URL http://qt-project.org)
-set_package_properties(Qt5Test PROPERTIES TYPE OPTIONAL PURPOSE "Building the tests")
-
 IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW"
 	ADD_DEFINITIONS(-std=c++0x) #Enable C++0x mode
 ENDIF()
@@ -57,11 +52,10 @@ ENDIF()
 INCLUDE(Packaging.cmake)
 
 OPTION(ENABLE_TESTS "Should the tests be built" ON)
-IF(ENABLE_TESTS AND Qt5Test_FOUND)
+IF(ENABLE_TESTS)
 	INCLUDE(CTest)
 	MARK_AS_ADVANCED(FORCE BUILD_TESTING)
 	ADD_SUBDIRECTORY(tests)
-	SET(BUILD_TESTS ON)
 ELSE()
 	SET(BUILD_TESTS OFF)
 ENDIF()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 37f90461..1fc1e9c9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -20,6 +20,11 @@
 # 3. This notice may not be removed or altered from any source
 # distribution.
 
+find_package(Qt5Test 5.2)
+
+set_package_properties(Qt5Test PROPERTIES DESCRIPTION "C++ framework" URL http://qt-project.org)
+set_package_properties(Qt5Test PROPERTIES TYPE OPTIONAL PURPOSE "Building the tests")
+
 # Creates a test from the inputs
 #
 # Also sets LATEST_TEST to point to the output executable of the test for easy
@@ -66,39 +71,45 @@ IF(BUILD_BINDINGS)
 	ENDIF()
 ENDIF()
 
-# AmbientOcclusionGenerator tests
-CREATE_TEST(TestAmbientOcclusionGenerator.cpp TestAmbientOcclusionGenerator)
-
-# Array tests
-CREATE_TEST(TestArray.cpp TestArray)
-
-# AStarPathfinder tests
-CREATE_TEST(TestAStarPathfinder.cpp TestAStarPathfinder)
-
-CREATE_TEST(TestCubicSurfaceExtractor.cpp TestCubicSurfaceExtractor)
-
-# Low pass filter tests
-CREATE_TEST(TestLowPassFilter.cpp TestLowPassFilter)
-
-# Material tests
-CREATE_TEST(testmaterial.cpp testmaterial)
-
-# Raycast tests
-CREATE_TEST(TestRaycast.cpp TestRaycast)
-
-# Picking tests
-CREATE_TEST(TestPicking.cpp TestPicking)
-
-# Region tests
-CREATE_TEST(TestRegion.cpp TestRegion)
-
-CREATE_TEST(TestSurfaceExtractor.cpp TestSurfaceExtractor)
-
-#Vector tests
-CREATE_TEST(testvector.cpp testvector)
-
-# Volume tests
-CREATE_TEST(testvolume.cpp testvolume)
-
-# Volume subclass tests
-CREATE_TEST(TestVolumeSubclass.cpp TestVolumeSubclass)
+if(Qt5Test_FOUND)
+	SET(BUILD_TESTS ON PARENT_SCOPE)
+	
+	# AmbientOcclusionGenerator tests
+	CREATE_TEST(TestAmbientOcclusionGenerator.cpp TestAmbientOcclusionGenerator)
+	
+	# Array tests
+	CREATE_TEST(TestArray.cpp TestArray)
+	
+	# AStarPathfinder tests
+	CREATE_TEST(TestAStarPathfinder.cpp TestAStarPathfinder)
+	
+	CREATE_TEST(TestCubicSurfaceExtractor.cpp TestCubicSurfaceExtractor)
+	
+	# Low pass filter tests
+	CREATE_TEST(TestLowPassFilter.cpp TestLowPassFilter)
+	
+	# Material tests
+	CREATE_TEST(testmaterial.cpp testmaterial)
+	
+	# Raycast tests
+	CREATE_TEST(TestRaycast.cpp TestRaycast)
+	
+	# Picking tests
+	CREATE_TEST(TestPicking.cpp TestPicking)
+	
+	# Region tests
+	CREATE_TEST(TestRegion.cpp TestRegion)
+	
+	CREATE_TEST(TestSurfaceExtractor.cpp TestSurfaceExtractor)
+	
+	#Vector tests
+	CREATE_TEST(testvector.cpp testvector)
+	
+	# Volume tests
+	CREATE_TEST(testvolume.cpp testvolume)
+	
+	# Volume subclass tests
+	CREATE_TEST(TestVolumeSubclass.cpp TestVolumeSubclass)
+else()
+	SET(BUILD_TESTS OFF PARENT_SCOPE)
+endif()
\ No newline at end of file