diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca928b5..710298a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.9)
 project(battleship)
 
 set(CMAKE_BUILD_TYPE Debug)
+set(BUILD_TESTS OFF)
 cmake_policy(SET CMP0015 NEW)
 
 set(states activeGameState.cpp inGameAppState.cpp guiAppState.cpp)
@@ -53,9 +54,20 @@ set(GLFW_LIB_DIR build/${GLFW_DIR}/src)
 include_directories(${GLFW_DIR}/include/GLFW)
 target_link_directories(${GAME_NAME} PUBLIC ${GLFW_LIB_DIR})
 
-target_link_libraries(${GAME_NAME} vb01)
-target_link_libraries(${GAME_NAME} vb01Gui)
-target_link_libraries(${GAME_NAME} gameBase)
-target_link_libraries(${GAME_NAME} sfml-system)
-target_link_libraries(${GAME_NAME} sfml-audio)
-target_link_libraries(${GAME_NAME} glfw)
+set(DEPS vb01 vb01Gui gameBase sfml-system sfml-audio glfw)
+target_link_libraries(${GAME_NAME} ${DEPS})
+
+if(BUILD_TESTS)
+	if(UNIX)
+		include_directories(/usr/include/cppunit)
+		link_directories(/usr/lib)
+	elseif(WIN32)
+		include_directories(C:/Program\ Files\ \(x86\)/cppunit/include)
+		link_directories(C:/Program\ Files\ \(x86\)/cppunit/lib)
+	endif()
+	
+	set(TEST_SRC testMain.cpp ${GAME_SRC})
+	
+	add_executable(battleshipTests ${TEST_SRC})
+	target_link_libraries(battleshipTests ${DEPS} cppunit)
+endif()
diff --git a/testMain.cpp b/testMain.cpp
new file mode 100644
index 0000000..d8a2db1
--- /dev/null
+++ b/testMain.cpp
@@ -0,0 +1,12 @@
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestResult.h>
+#include <cppunit/TestCaller.h>
+#include <cppunit/ui/text/TestRunner.h>
+
+using namespace CppUnit;
+
+int main(){
+	TextUi::TestRunner runner;
+	runner.run();
+	return 0;
+}