diff --git a/CMakeLists.txt b/CMakeLists.txt
index d23e74a..dfef6cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ file(MAKE_DIRECTORY ${PROD_RESOURCES_DIRECTORY}/temp)
 
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 
-set(BASE_TARGETS concordia utf8case)
+set(BASE_TARGETS concordia)
 
 
                 
@@ -150,7 +150,7 @@ endforeach(dir)
 # Tests
 # ================================================
 
-set(TESTS_TARGETS concordia-tests utf8case-tests)
+set(TESTS_TARGETS concordia-tests)
 
 add_subdirectory(tests)
 
diff --git a/concordia/t/CMakeLists.txt b/concordia/t/CMakeLists.txt
index 05f892d..500de61 100644
--- a/concordia/t/CMakeLists.txt
+++ b/concordia/t/CMakeLists.txt
@@ -11,6 +11,9 @@ add_library(concordia-tests
   test_concordia_index.cpp
   test_concordia_config.cpp
   test_concordia.cpp
+  range_based_case_converter_tests.cpp
+  simple_convert_tests.cpp
+  special_casing_converter_tests.cpp
   )
 
-target_link_libraries(concordia-tests concordia ${LIBCONFIG_LIB} concordia-tests-common)
+target_link_libraries(concordia-tests concordia ${LIBCONFIG_LIB} concordia-tests-common utf8case)
diff --git a/utf8case/t/range_based_case_converter_tests.cpp b/concordia/t/range_based_case_converter_tests.cpp
similarity index 100%
rename from utf8case/t/range_based_case_converter_tests.cpp
rename to concordia/t/range_based_case_converter_tests.cpp
diff --git a/utf8case/t/simple_convert_tests.cpp b/concordia/t/simple_convert_tests.cpp
similarity index 100%
rename from utf8case/t/simple_convert_tests.cpp
rename to concordia/t/simple_convert_tests.cpp
diff --git a/utf8case/t/special_casing_converter_tests.cpp b/concordia/t/special_casing_converter_tests.cpp
similarity index 92%
rename from utf8case/t/special_casing_converter_tests.cpp
rename to concordia/t/special_casing_converter_tests.cpp
index f320e86..c86d51a 100644
--- a/utf8case/t/special_casing_converter_tests.cpp
+++ b/concordia/t/special_casing_converter_tests.cpp
@@ -25,8 +25,4 @@ BOOST_AUTO_TEST_CASE( special_casing_converter ) {
     BOOST_CHECK_EQUAL(converter.convert(ESZET_CODE_POINT), "SS");
 }
 
-BOOST_AUTO_TEST_CASE( special_casing_converter2 ) {
-    BOOST_CHECK_EQUAL("SS", "SS");
-
-}
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/utf8case/CMakeLists.txt b/utf8case/CMakeLists.txt
index 8c2edbb..55df320 100644
--- a/utf8case/CMakeLists.txt
+++ b/utf8case/CMakeLists.txt
@@ -9,8 +9,6 @@ add_library(utf8case SHARED
     turkish_and_azeri_upper_contextual_case_converter.cpp
 )
 
-add_subdirectory(t)
-
 install(TARGETS utf8case DESTINATION lib/)
 install(FILES 
         case_converter_factory.hpp
diff --git a/utf8case/t/CMakeLists.txt b/utf8case/t/CMakeLists.txt
deleted file mode 100644
index a550899..0000000
--- a/utf8case/t/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_library(utf8case-tests
-   range_based_case_converter_tests.cpp
-   simple_convert_tests.cpp
-   special_casing_converter_tests.cpp
-)
-
-target_link_libraries(utf8case-tests utf8case)