diff --git a/CMakeLists.txt b/CMakeLists.txt
index be6f40a..6763629 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,14 +66,13 @@ endif()
 
 set(FPNG_SRC_LIST ${COMMON_SRC_LIST} 
 	src/fpng.cpp
-	src/fpng_test.cpp
 	src/lodepng.cpp
 	src/pvpngreader.cpp
 	)
 
 file(GLOB_RECURSE fpng_HEADERS "src/*.h")
 
-add_library(fpng SHARED ${FPNG_SRC_LIST} ${fpng_HEADERS})
+add_library(fpng SHARED ${FPNG_SRC_LIST})
 
 set_target_properties(fpng PROPERTIES LINKER_LANGUAGE CXX)
 
@@ -81,6 +80,8 @@ install(TARGETS ${PROJECT_NAME} DESTINATION lib/${PROJECT_NAME})
 
 install(FILES ${fpng_HEADERS} DESTINATION include/${PROJECT_NAME})
 
+include_directories("src")
+
 if (APPLE)
    set(BIN_DIRECTORY "bin_osx")
 else()
@@ -89,10 +90,10 @@ endif()
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${BIN_DIRECTORY})
 
-add_executable(fpng_test ${FPNG_SRC_LIST})
+add_executable(fpng_test "src/fpng_test.cpp")
 
 if (NOT MSVC)
-   target_link_libraries(fpng_test m pthread)
+   target_link_libraries(fpng_test fpng m pthread)
 endif()
 
 install(TARGETS fpng_test DESTINATION bin)