diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67a8e860f..76e8b8447 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,10 @@ else()
 	endif()
 endif()
 
+add_subdirectory(spine-c)
+add_subdirectory(spine-cpp)
+add_subdirectory(spine-cpp/spine-cpp-unit-tests)
+
 if((${SPINE_SFML}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sfml"))
 	if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		set(CMAKE_OSX_ARCHITECTURES x86_64)
@@ -27,7 +31,6 @@ if((${SPINE_SFML}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sfml"))
 	endif()
 	add_subdirectory(spine-c)
 	add_subdirectory(spine-sfml/c)
-	add_subdirectory(spine-cpp)
 	add_subdirectory(spine-sfml/cpp)
 endif()
 
@@ -37,9 +40,6 @@ if((${SPINE_SDL}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sdl"))
 		set(ONLY_ACTIVE_ARCH NO)
 	endif()
 	add_subdirectory(spine-c)
-	add_subdirectory(spine-cpp)
 	add_subdirectory(spine-sdl)
 endif()
 
-# add_subdirectory(spine-c/spine-c-unit-tests)
-add_subdirectory(spine-cpp/spine-cpp-unit-tests)
diff --git a/spine-cpp/spine-cpp-unit-tests/CMakeLists.txt b/spine-cpp/spine-cpp-unit-tests/CMakeLists.txt
index e853f5692..e745514bf 100755
--- a/spine-cpp/spine-cpp-unit-tests/CMakeLists.txt
+++ b/spine-cpp/spine-cpp-unit-tests/CMakeLists.txt
@@ -1,18 +1,9 @@
 project(spine_cpp_unit_test)
 
-set(CMAKE_INSTALL_PREFIX "./")
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
-include_directories(../spine-cpp/include teamcity minicppunit tests memory)
-
-set(SRC
-        src/main.cpp
-        )
-
+set(SRC src/main.cpp)
 add_executable(spine_cpp_unit_test ${SRC})
 target_link_libraries(spine_cpp_unit_test spine-cpp)
 
-
 #########################################################
 # copy resources to build output directory
 #########################################################
diff --git a/spine-cpp/spine-cpp-unit-tests/src/main.cpp b/spine-cpp/spine-cpp-unit-tests/src/main.cpp
index 6cb8e0535..3adf2f560 100644
--- a/spine-cpp/spine-cpp-unit-tests/src/main.cpp
+++ b/spine-cpp/spine-cpp-unit-tests/src/main.cpp
@@ -102,7 +102,7 @@ namespace spine {
 	SpineExtension *getDefaultExtension() {
 		return new DefaultSpineExtension();
 	}
-}// namespace spine
+}
 
 int main(int argc, char **argv) {
 	SP_UNUSED(argc);