diff --git a/examples/chatserver/CMakeLists.txt b/examples/chatserver/CMakeLists.txt
index be9e31d..5fdc805 100644
--- a/examples/chatserver/CMakeLists.txt
+++ b/examples/chatserver/CMakeLists.txt
@@ -7,9 +7,6 @@ qt5_add_resources(QRC resources.qrc)
 
 add_executable(chatserver ${SRC} ${QRC})
 target_link_libraries(chatserver QHttpEngine)
-set_target_properties(chatserver PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}"
-)
 
 install(TARGETS chatserver
     RUNTIME DESTINATION "${EXAMPLE_DIR}"
diff --git a/examples/fileserver/CMakeLists.txt b/examples/fileserver/CMakeLists.txt
index 11423c2..f95a336 100644
--- a/examples/fileserver/CMakeLists.txt
+++ b/examples/fileserver/CMakeLists.txt
@@ -4,9 +4,6 @@ set(SRC
 
 add_executable(fileserver ${SRC})
 target_link_libraries(fileserver QHttpEngine)
-set_target_properties(fileserver PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}"
-)
 
 install(TARGETS fileserver
     RUNTIME DESTINATION "${EXAMPLE_DIR}"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1675ad3..83f9a4c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
-configure_file(qhttpengine.h.in "${CMAKE_CURRENT_BINARY_DIR}/qhttpengine.h")
-
 file(GLOB HEADERS "${PROJECT_NAME}/*")
+
+configure_file(qhttpengine.h.in "${CMAKE_CURRENT_BINARY_DIR}/qhttpengine.h")
 set(HEADERS "${HEADERS}" "${CMAKE_CURRENT_BINARY_DIR}/qhttpengine.h")
 
 set(SRC
@@ -40,8 +40,6 @@ set_target_properties(QHttpEngine PROPERTIES
     PUBLIC_HEADER "${HEADERS}"
     VERSION ${PROJECT_VERSION}
     SOVERSION ${PROJECT_VERSION_MAJOR}
-    RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}"
-    LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}"
 )
 
 install(TARGETS QHttpEngine EXPORT QHttpEngine-export
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4435098..ad224b4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,30 +1,25 @@
-find_package(Qt5Test REQUIRED)
+find_package(Qt5Test 5.1 REQUIRED)
 
 add_subdirectory(common)
 
 set(TESTS
-    TestQFilesystemHandler.cpp
-    TestQHttpHandler.cpp
-    TestQHttpParser.cpp
-    TestQHttpServer.cpp
-    TestQHttpSocket.cpp
-    TestQIByteArray.cpp
-    TestQIODeviceCopier.cpp
-    TestQLocalFile.cpp
-    TestQObjectHandler.cpp
+    TestQFilesystemHandler
+    TestQHttpHandler
+    TestQHttpParser
+    TestQHttpServer
+    TestQHttpSocket
+    TestQIByteArray
+    TestQIODeviceCopier
+    TestQLocalFile
+    TestQObjectHandler
 )
 
 foreach(TEST ${TESTS})
-    get_filename_component(NAME "${TEST}" NAME_WE)
-
-    add_executable(${NAME} "${TEST}")
-    qt5_use_modules(${NAME} Test)
-    target_link_libraries(${NAME} QHttpEngine common)
-    set_target_properties(${NAME} PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}"
-    )
-
-    add_test(NAME ${NAME}
-        COMMAND ${NAME}
+    add_executable(${TEST} ${TEST}.cpp)
+    qt5_use_modules(${TEST} Test)
+    target_link_libraries(${TEST} QHttpEngine common)
+    add_test(NAME ${TEST}
+        COMMAND ${TEST}
+        WORKING_DIRECTORY "$<TARGET_FILE_DIR:QHttpEngine>"
     )
 endforeach()