--- a/ui/tests/CMakeLists.txt	Wed Apr 16 13:41:10 2014 +0000
+++ b/ui/tests/CMakeLists.txt	Wed Apr 16 14:00:12 2014 +0000
@@ -22,7 +22,7 @@
   add_definitions(-DHIAWATHA_EXECUTABLE="${HIAWATHA_EXECUTABLE}")
 endif()
 
-macro(add_m13_test _source _additional_sources)
+macro(add_custom_test _source _additional_sources)
   set(_test ${_source})
   get_filename_component(_name ${_source} NAME_WE)
   set(_test_sources_with_resources ${_test}
@@ -30,7 +30,7 @@
   qt5_add_resources(_test_sources_with_resources
      ${CMAKE_CURRENT_SOURCE_DIR}/data/testdata.qrc)
   add_executable(${_name} ${_test_sources_with_resources})
-  add_test(m13-${_name} ${_name})
+  add_test(tb-${_name} ${_name})
   target_link_libraries(${_name} Qt5::Test Qt5::Widgets
      trustbridge_common
      ${POLARSSL_LIBRARIES}
@@ -40,22 +40,22 @@
 # Add the current source dir to the definition
 # so that it can be used in file names in the tests.
 add_definitions(-DSOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
-add_m13_test(certlistparsertest.cpp "${CERTIFICATELIST_SOURCES}")
+add_custom_test(certlistparsertest.cpp "${CERTIFICATELIST_SOURCES}")
 
 # Downloader
 if (HIAWATHA_EXECUTABLE)
   set(DOWNLOADER_SOURCES_WITH_RESOURCES ${DOWNLOADER_SOURCES})
   qt5_add_resources(DOWNLOADER_SOURCES_WITH_RESOURCES ${TRUSTBRIDGE_RESOURCES})
-  add_m13_test(downloadertest.cpp "${DOWNLOADER_SOURCES_WITH_RESOURCES}")
+  add_custom_test(downloadertest.cpp "${DOWNLOADER_SOURCES_WITH_RESOURCES}")
 endif()
 
 # Cinstprocess
-add_m13_test(cinstprocesstest.cpp "${CERTIFICATELIST_SOURCES}")
+add_custom_test(cinstprocesstest.cpp "${CERTIFICATELIST_SOURCES}")
 add_dependencies(cinstprocesstest cinst)
-add_m13_test(commontest.cpp "")
+add_custom_test(commontest.cpp "")
 
 if (WIN32)
-   add_m13_test(windowsstoretest.cpp "${CERTIFICATELIST_SOURCES};${CMAKE_SOURCE_DIR}/cinst/windowsstore.c")
+   add_custom_test(windowsstoretest.cpp "${CERTIFICATELIST_SOURCES};${CMAKE_SOURCE_DIR}/cinst/windowsstore.c")
 endif (WIN32)
 
 if (NSS_FOUND)
@@ -64,7 +64,7 @@
       ${CERTIFICATELIST_SOURCES}
       ${CMAKE_SOURCE_DIR}/cinst/nssstore_linux.c
       ${CMAKE_SOURCE_DIR}/cinst/nssstore_win.c)
-   add_m13_test(nsstest.cpp "${NSSTEST_SOURCES}")
+   add_custom_test(nsstest.cpp "${NSSTEST_SOURCES}")
    target_link_libraries(nsstest ${NSS_LIBRARIES})
    if (WIN32)
       target_link_libraries(nsstest -luserenv)
@@ -73,5 +73,5 @@
    add_dependencies(nsstest mozilla)
 endif()
 
-#add_m13_test(${CMAKE_SOURCE_DIR}/ui/main.cpp "${TRUSTBRIDGE_SOURCES}")
+#add_custom_test(${CMAKE_SOURCE_DIR}/ui/main.cpp "${TRUSTBRIDGE_SOURCES}")