diff --git a/projects/rocprofiler-compute/CMakeLists.txt b/projects/rocprofiler-compute/CMakeLists.txt
index f4833ca3fc..83bc5ccbb6 100644
--- a/projects/rocprofiler-compute/CMakeLists.txt
+++ b/projects/rocprofiler-compute/CMakeLists.txt
@@ -178,8 +178,9 @@ if(${ENABLE_COVERAGE})
 endif()
 message(STATUS "Code coverage: ${ENABLE_COVERAGE}")
 
-# --------------------------------------------------------------------------------------------------------
+# ---------------------------
 # profile mode tests
+# ---------------------------
 
 add_test(
     NAME test_profile_kernel_execution
@@ -243,23 +244,107 @@ set_tests_properties(
     test_profile_misc
     PROPERTIES LABELS "profile" RESOURCE_GROUPS gpus:1)
 
-# original
-# add_test(
-#     NAME test_profiler_general
-#     COMMAND pytest ${COV_OPTION} ${PROJECT_SOURCE_DIR}/tests/test_profile_general.py
-#     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
-# --------------------------------------------------------------------------------------------------------
+# original add_test( NAME test_profiler_general COMMAND pytest ${COV_OPTION}
+# ${PROJECT_SOURCE_DIR}/tests/test_profile_general.py WORKING_DIRECTORY
+# ${PROJECT_SOURCE_DIR})
+
+# ---------------------------
+# analysis command tests
+# ---------------------------
 
 add_test(
-    NAME test_analyze_commands
-    COMMAND pytest ${COV_OPTION} ${PROJECT_SOURCE_DIR}/tests/test_analyze_commands.py
+    NAME test_analyze_commands_misc
+    COMMAND pytest -m misc ${COV_OPTION}
+            ${PROJECT_SOURCE_DIR}/tests/test_analyze_commands.py
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 
+add_test(
+    NAME test_analyze_commands_list_metrics
+    COMMAND pytest -m list_metrics ${COV_OPTION}
+            ${PROJECT_SOURCE_DIR}/tests/test_analyze_commands.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+add_test(
+    NAME test_analyze_commands_filter_metrics
+    COMMAND pytest -m filter_metrics ${COV_OPTION}
+            ${PROJECT_SOURCE_DIR}/tests/test_analyze_commands.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+add_test(
+    NAME test_analyze_commands_filter_kernel
+    COMMAND pytest -m filter_kernel ${COV_OPTION}
+            ${PROJECT_SOURCE_DIR}/tests/test_analyze_commands.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+add_test(
+    NAME test_analyze_commands_dispatch
+    COMMAND pytest -m dispatch ${COV_OPTION}
+            ${PROJECT_SOURCE_DIR}/tests/test_analyze_commands.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+add_test(
+    NAME test_analyze_commands_normal_unit
+    COMMAND pytest -m normal_unit ${COV_OPTION}
+            ${PROJECT_SOURCE_DIR}/tests/test_analyze_commands.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+add_test(
+    NAME test_analyze_commands_max_kernel
+    COMMAND pytest -m max_kernel ${COV_OPTION}
+            ${PROJECT_SOURCE_DIR}/tests/test_analyze_commands.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+add_test(
+    NAME test_analyze_commands_time_unit
+    COMMAND pytest -m time_unit ${COV_OPTION}
+            ${PROJECT_SOURCE_DIR}/tests/test_analyze_commands.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+add_test(
+    NAME test_analyze_commands_decimal
+    COMMAND pytest -m decimal ${COV_OPTION}
+            ${PROJECT_SOURCE_DIR}/tests/test_analyze_commands.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+add_test(
+    NAME test_analyze_commands_col
+    COMMAND pytest -m col ${COV_OPTION}
+            ${PROJECT_SOURCE_DIR}/tests/test_analyze_commands.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+add_test(
+    NAME test_analyze_commands_kernel_verbose
+    COMMAND pytest -m kernel_verbose ${COV_OPTION}
+            ${PROJECT_SOURCE_DIR}/tests/test_analyze_commands.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+set_tests_properties(
+    test_analyze_commands_misc
+    test_analyze_commands_list_metrics
+    test_analyze_commands_filter_metrics
+    test_analyze_commands_filter_kernel
+    test_analyze_commands_dispatch
+    test_analyze_commands_normal_unit
+    test_analyze_commands_max_kernel
+    test_analyze_commands_time_unit
+    test_analyze_commands_decimal
+    test_analyze_commands_col
+    test_analyze_commands_kernel_verbose
+    PROPERTIES LABELS "analyze_commands")
+
+# ---------------------------
+# analyze workloads tests
+# ---------------------------
+
 add_test(
     NAME test_analyze_workloads
     COMMAND pytest ${COV_OPTION} ${PROJECT_SOURCE_DIR}/tests/test_analyze_workloads.py
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 
+# ---------------------------
+# saved analysis tests
+# ---------------------------
+
 add_test(
     NAME test_saved_analysis
     COMMAND pytest ${COV_OPTION} ${PROJECT_SOURCE_DIR}/tests/test_saved_analysis.py