diff --git a/.gitignore b/.gitignore
index ffd2eda..9364ec4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,7 @@ test/iterate
 test/case
 test/custom
 /tmp/
+mingw_static
+mingw_shared
+msvc_shared
+msvc_static
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ed9716..f5406fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,22 +75,23 @@ if(UTF8PROC_ENABLE_TESTING)
   target_link_libraries(printproperty utf8proc)
   add_executable(valid test/tests.h test/tests.c utf8proc.h test/valid.c)
   target_link_libraries(valid utf8proc)
-  add_test(testcase case)
-  add_test(testcustom custom)
-  add_test(testiterate iterate)
-  add_test(testmisc misc)
-  add_test(testprintproperty printproperty)
-  add_test(testvalid valid)
+  add_test(utf8proc.testcase case)
+  add_test(utf8proc.testcustom custom)
+  add_test(utf8proc.testiterate iterate)
+  add_test(utf8proc.testmisc misc)
+  add_test(utf8proc.testprintproperty printproperty)
+  add_test(utf8proc.testvalid valid)
+
   if (NOT WIN32)
     # no wcwidth function on Windows
     add_executable(charwidth test/tests.h test/tests.c utf8proc.h test/charwidth.c)
     target_link_libraries(charwidth utf8proc)
-    add_test(testcharwidth charwidth)
+    add_test(utf8proc.testcharwidth charwidth)
   endif()
   add_executable(graphemetest test/tests.h test/tests.c utf8proc.h test/graphemetest.c)
   target_link_libraries(graphemetest utf8proc)
   add_executable(normtest test/tests.h test/tests.c utf8proc.h test/normtest.c)
   target_link_libraries(normtest utf8proc)
-  #add_test(testgraphemetest graphemetest data/GraphemeBreakTest.txt)
-  #add_test(testnormtest normtest data/NormalizationTest.txt)
+  #add_test(utf8proc.testgraphemetest graphemetest data/GraphemeBreakTest.txt)
+  #add_test(utf8proc.testnormtest normtest data/NormalizationTest.txt)
 endif()