diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 5c5c6aafea95fc5eda85d27a3003fc9658d05301..1956bb48d2bb50f6af8d92e90370ce40e9295f72 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -76,7 +76,7 @@ add_subdirectory(test/SANS)
 
 # python unit tests
 if (PYUNITTEST_FOUND)
-  pyunittest_add_test ( ${CMAKE_CURRENT_SOURCE_DIR}/test PythonScriptsTest ${TEST_PY_FILES} )
+  pyunittest_add_test ( ${CMAKE_CURRENT_SOURCE_DIR}/test python.scripts ${TEST_PY_FILES} )
   # Trying to add tested modules to python system path
   #set (ENV{PYTHONPATH}  "ENV{PYTHONPATH} ${CMAKE_CURRENT_SOURCE_DIR}/Inelastic" )
 endif ()
diff --git a/scripts/test/SANS/algorithm_detail/CMakeLists.txt b/scripts/test/SANS/algorithm_detail/CMakeLists.txt
index b1338d36883949399575d893faaafb87c79b9479..e838aff992061b20babb17578e2ae292b7929965 100644
--- a/scripts/test/SANS/algorithm_detail/CMakeLists.txt
+++ b/scripts/test/SANS/algorithm_detail/CMakeLists.txt
@@ -12,5 +12,4 @@ set ( TEST_PY_FILES
 
 check_tests_valid ( ${CMAKE_CURRENT_SOURCE_DIR} ${TEST_PY_FILES} )
 
-# Prefix for test name=PythonSANS
-pyunittest_add_test ( ${CMAKE_CURRENT_SOURCE_DIR} PythonSANS ${TEST_PY_FILES} )
+pyunittest_add_test ( ${CMAKE_CURRENT_SOURCE_DIR} python.SANS.algorithm_detail ${TEST_PY_FILES} )
diff --git a/scripts/test/SANS/command_interface/CMakeLists.txt b/scripts/test/SANS/command_interface/CMakeLists.txt
index 3826c64dc13722c4962608f374676c747c0b71f7..72c6123e5ace95bfd287c408c4b2708d68523a26 100644
--- a/scripts/test/SANS/command_interface/CMakeLists.txt
+++ b/scripts/test/SANS/command_interface/CMakeLists.txt
@@ -10,4 +10,4 @@ set ( TEST_PY_FILES
 check_tests_valid ( ${CMAKE_CURRENT_SOURCE_DIR} ${TEST_PY_FILES} )
 
 # Prefix for test name=PythonAlgorithms
-pyunittest_add_test ( ${CMAKE_CURRENT_SOURCE_DIR} PythonAlgorithmsSANS ${TEST_PY_FILES} )
+pyunittest_add_test ( ${CMAKE_CURRENT_SOURCE_DIR} python.SANS.common_interface ${TEST_PY_FILES} )
diff --git a/scripts/test/SANS/state/CMakeLists.txt b/scripts/test/SANS/state/CMakeLists.txt
index a9a1eaef13846fa1c9fdc58b9edc3ffb11749269..df7ab8b617e553740129c6a9e542c9d0cb3297ef 100644
--- a/scripts/test/SANS/state/CMakeLists.txt
+++ b/scripts/test/SANS/state/CMakeLists.txt
@@ -24,4 +24,4 @@ set ( TEST_PY_FILES
 check_tests_valid ( ${CMAKE_CURRENT_SOURCE_DIR} ${TEST_PY_FILES} )
 
 # Prefix for test name=PythonAlgorithms
-pyunittest_add_test ( ${CMAKE_CURRENT_SOURCE_DIR} PythonAlgorithmsSANS ${TEST_PY_FILES} )
+pyunittest_add_test ( ${CMAKE_CURRENT_SOURCE_DIR} python.SANS.state ${TEST_PY_FILES} )
diff --git a/scripts/test/SANS/user_file/CMakeLists.txt b/scripts/test/SANS/user_file/CMakeLists.txt
index 36343925914b3b4b8a567d150aae4a7dd4c6c002..9735c24870181fd6de233cf9582e716e99c6b888 100644
--- a/scripts/test/SANS/user_file/CMakeLists.txt
+++ b/scripts/test/SANS/user_file/CMakeLists.txt
@@ -11,4 +11,4 @@ set ( TEST_PY_FILES
 check_tests_valid ( ${CMAKE_CURRENT_SOURCE_DIR} ${TEST_PY_FILES} )
 
 # Prefix for test name=PythonAlgorithms
-pyunittest_add_test ( ${CMAKE_CURRENT_SOURCE_DIR} PythonAlgorithmsSANS ${TEST_PY_FILES} )
+pyunittest_add_test ( ${CMAKE_CURRENT_SOURCE_DIR} python.SANS.user_file ${TEST_PY_FILES} )